From: Greg Kroah-Hartman Date: Sat, 23 Sep 2023 08:29:23 +0000 (+0200) Subject: drop a bunch of patches X-Git-Tag: v4.14.326~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3f1ed38f3b59e426e4a8942e011bc650a199a7b;p=thirdparty%2Fkernel%2Fstable-queue.git drop a bunch of patches --- diff --git a/queue-5.10/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch b/queue-5.10/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch deleted file mode 100644 index 88dab6e4371..00000000000 --- a/queue-5.10/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7eafa0453fad740d53915d98678684fd8d80890a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 22 Aug 2023 12:38:40 -0700 -Subject: libbpf: Free btf_vmlinux when closing bpf_object - -From: Hao Luo - -[ Upstream commit 29d67fdebc42af6466d1909c60fdd1ef4f3e5240 ] - -I hit a memory leak when testing bpf_program__set_attach_target(). -Basically, set_attach_target() may allocate btf_vmlinux, for example, -when setting attach target for bpf_iter programs. But btf_vmlinux -is freed only in bpf_object_load(), which means if we only open -bpf object but not load it, setting attach target may leak -btf_vmlinux. - -So let's free btf_vmlinux in bpf_object__close() anyway. - -Signed-off-by: Hao Luo -Signed-off-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20230822193840.1509809-1-haoluo@google.com -Signed-off-by: Sasha Levin ---- - tools/lib/bpf/libbpf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c -index 015ed8253f739..44646c5286fbe 100644 ---- a/tools/lib/bpf/libbpf.c -+++ b/tools/lib/bpf/libbpf.c -@@ -7962,6 +7962,7 @@ void bpf_object__close(struct bpf_object *obj) - bpf_object__elf_finish(obj); - bpf_object__unload(obj); - btf__free(obj->btf); -+ btf__free(obj->btf_vmlinux); - btf_ext__free(obj->btf_ext); - - for (i = 0; i < obj->nr_maps; i++) --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 284bba7278c..be8a541bec4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -21,7 +21,6 @@ mmc-sdhci-esdhc-imx-improve-esdhc_flag_err010450.patch alx-fix-oob-read-compiler-warning.patch netfilter-ebtables-fix-fortify-warnings-in-size_entr.patch wifi-mac80211_hwsim-drop-short-frames.patch -libbpf-free-btf_vmlinux-when-closing-bpf_object.patch drm-bridge-tc358762-instruct-dsi-host-to-generate-hs.patch samples-hw_breakpoint-fix-kernel-bug-invalid-opcode-.patch alsa-hda-intel-dsp-cfg-add-lunarlake-support.patch diff --git a/queue-5.15/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch b/queue-5.15/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch deleted file mode 100644 index 233d95994c7..00000000000 --- a/queue-5.15/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 42997ebcfae405d18b1fdc0435f79013ddaeb23b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 22 Aug 2023 12:38:40 -0700 -Subject: libbpf: Free btf_vmlinux when closing bpf_object - -From: Hao Luo - -[ Upstream commit 29d67fdebc42af6466d1909c60fdd1ef4f3e5240 ] - -I hit a memory leak when testing bpf_program__set_attach_target(). -Basically, set_attach_target() may allocate btf_vmlinux, for example, -when setting attach target for bpf_iter programs. But btf_vmlinux -is freed only in bpf_object_load(), which means if we only open -bpf object but not load it, setting attach target may leak -btf_vmlinux. - -So let's free btf_vmlinux in bpf_object__close() anyway. - -Signed-off-by: Hao Luo -Signed-off-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20230822193840.1509809-1-haoluo@google.com -Signed-off-by: Sasha Levin ---- - tools/lib/bpf/libbpf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c -index f87a15bbf53b3..9b8a0fe0eb1c3 100644 ---- a/tools/lib/bpf/libbpf.c -+++ b/tools/lib/bpf/libbpf.c -@@ -7559,6 +7559,7 @@ void bpf_object__close(struct bpf_object *obj) - bpf_object__elf_finish(obj); - bpf_object__unload(obj); - btf__free(obj->btf); -+ btf__free(obj->btf_vmlinux); - btf_ext__free(obj->btf_ext); - - for (i = 0; i < obj->nr_maps; i++) --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 02716c9e8c9..2d6f01e2060 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -23,7 +23,6 @@ alx-fix-oob-read-compiler-warning.patch wifi-mac80211-check-s1g-action-frame-size.patch netfilter-ebtables-fix-fortify-warnings-in-size_entr.patch wifi-mac80211_hwsim-drop-short-frames.patch -libbpf-free-btf_vmlinux-when-closing-bpf_object.patch drm-bridge-tc358762-instruct-dsi-host-to-generate-hs.patch arm64-dts-qcom-sm6125-pdx201-correct-ramoops-pmsg-si.patch arm64-dts-qcom-sm8150-kumano-correct-ramoops-pmsg-si.patch diff --git a/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch b/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch deleted file mode 100644 index d1d7b3e23b5..00000000000 --- a/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4025fa88dcde5fb13d8a0eba0bf1fce984b06dc8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Oct 2019 15:19:08 +0800 -Subject: clk: imx: clk-pll14xx: Make two variables static - -From: YueHaibing - -[ Upstream commit 8f2d3c1759d19232edf1e9ef43d40a44e31493d6 ] - -Fix sparse warnings: - -drivers/clk/imx/clk-pll14xx.c:44:37: - warning: symbol 'imx_pll1416x_tbl' was not declared. Should it be static? -drivers/clk/imx/clk-pll14xx.c:57:37: - warning: symbol 'imx_pll1443x_tbl' was not declared. Should it be static? - -Reported-by: Hulk Robot -Signed-off-by: YueHaibing -Reviewed-by: Anson Huang -Signed-off-by: Shawn Guo -Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index c43e9653b4156..129a28c3366eb 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -41,7 +41,7 @@ struct clk_pll14xx { - - #define to_clk_pll14xx(_hw) container_of(_hw, struct clk_pll14xx, hw) - --const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { -+static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - PLL_1416X_RATE(1800000000U, 225, 3, 0), - PLL_1416X_RATE(1600000000U, 200, 3, 0), - PLL_1416X_RATE(1200000000U, 300, 3, 1), -@@ -52,7 +52,7 @@ const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - PLL_1416X_RATE(600000000U, 300, 3, 2), - }; - --const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { -+static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), - PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), --- -2.40.1 - diff --git a/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch b/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch deleted file mode 100644 index c63cb3f25b6..00000000000 --- a/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 83b2f46dab7f20ee4881e8afc89adf0d628303a8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Jan 2020 14:50:49 +0800 -Subject: clk: imx: pll14xx: Add new frequency entries for pll1443x table - -From: Anson Huang - -[ Upstream commit 57795654fb553a78f07a9f92d87fb2582379cd93 ] - -Add new frequency entries to pll1443x table to meet different -display settings requirement. - -Signed-off-by: Anson Huang -Reviewed-by: Peng Fan -Signed-off-by: Shawn Guo -Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index 129a28c3366eb..e7bf6babc28b4 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -53,8 +53,10 @@ static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - }; - - static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { -+ PLL_1443X_RATE(1039500000U, 173, 2, 1, 16384), - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), -+ PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), - PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), - PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), - }; --- -2.40.1 - diff --git a/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch b/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch deleted file mode 100644 index 96e53c62b58..00000000000 --- a/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 3c1a0cd1360ac0d0ccc454af27778439077968b3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 7 Aug 2023 10:47:44 +0200 -Subject: clk: imx: pll14xx: dynamically configure PLL for - 393216000/361267200Hz - -From: Ahmad Fatoum - -[ Upstream commit 72d00e560d10665e6139c9431956a87ded6e9880 ] - -Since commit b09c68dc57c9 ("clk: imx: pll14xx: Support dynamic rates"), -the driver has the ability to dynamically compute PLL parameters to -approximate the requested rates. This is not always used, because the -logic is as follows: - - - Check if the target rate is hardcoded in the frequency table - - Check if varying only kdiv is possible, so switch over is glitch free - - Compute rate dynamically by iterating over pdiv range - -If we skip the frequency table for the 1443x PLL, we find that the -computed values differ to the hardcoded ones. This can be valid if the -hardcoded values guarantee for example an earlier lock-in or if the -divisors are chosen, so that other important rates are more likely to -be reached glitch-free. - -For rates (393216000 and 361267200, this doesn't seem to be the case: -They are only approximated by existing parameters (393215995 and -361267196 Hz, respectively) and they aren't reachable glitch-free from -other hardcoded frequencies. Dropping them from the table allows us -to lock-in to these frequencies exactly. - -This is immediately noticeable because they are the assigned-clock-rates -for IMX8MN_AUDIO_PLL1 and IMX8MN_AUDIO_PLL2, respectively and a look -into clk_summary so far showed that they were a few Hz short of the target: - -imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary -audio_pll2_out 0 0 0 361267196 0 0 50000 N -audio_pll1_out 1 1 0 393215995 0 0 50000 Y - -and afterwards: - -imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary -audio_pll2_out 0 0 0 361267200 0 0 50000 N -audio_pll1_out 1 1 0 393216000 0 0 50000 Y - -This change is equivalent to adding following hardcoded values: - - /* rate mdiv pdiv sdiv kdiv */ - PLL_1443X_RATE(393216000, 655, 5, 3, 23593), - PLL_1443X_RATE(361267200, 497, 33, 0, -16882), - -Fixes: 053a4ffe2988 ("clk: imx: imx8mm: fix audio pll setting") -Cc: stable@vger.kernel.org # v5.18+ -Signed-off-by: Ahmad Fatoum -Signed-off-by: Marco Felsch -Link: https://lore.kernel.org/r/20230807084744.1184791-2-m.felsch@pengutronix.de -Signed-off-by: Abel Vesa -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index e7bf6babc28b4..0dbe8c05af478 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -57,8 +57,6 @@ static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), - PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), -- PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), -- PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), - }; - - struct imx_pll14xx_clk imx_1443x_pll = { --- -2.40.1 - diff --git a/queue-5.4/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch b/queue-5.4/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch deleted file mode 100644 index b5c152579c5..00000000000 --- a/queue-5.4/libbpf-free-btf_vmlinux-when-closing-bpf_object.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3fc7deb49fe22dbae16e7d81da0f187ab97cb8bb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 22 Aug 2023 12:38:40 -0700 -Subject: libbpf: Free btf_vmlinux when closing bpf_object - -From: Hao Luo - -[ Upstream commit 29d67fdebc42af6466d1909c60fdd1ef4f3e5240 ] - -I hit a memory leak when testing bpf_program__set_attach_target(). -Basically, set_attach_target() may allocate btf_vmlinux, for example, -when setting attach target for bpf_iter programs. But btf_vmlinux -is freed only in bpf_object_load(), which means if we only open -bpf object but not load it, setting attach target may leak -btf_vmlinux. - -So let's free btf_vmlinux in bpf_object__close() anyway. - -Signed-off-by: Hao Luo -Signed-off-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20230822193840.1509809-1-haoluo@google.com -Signed-off-by: Sasha Levin ---- - tools/lib/bpf/libbpf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c -index b8849812449c3..343018632d2d1 100644 ---- a/tools/lib/bpf/libbpf.c -+++ b/tools/lib/bpf/libbpf.c -@@ -4202,6 +4202,7 @@ void bpf_object__close(struct bpf_object *obj) - bpf_object__elf_finish(obj); - bpf_object__unload(obj); - btf__free(obj->btf); -+ btf__free(obj->btf_vmlinux); - btf_ext__free(obj->btf_ext); - - for (i = 0; i < obj->nr_maps; i++) { --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index a1e8d4ac889..c409d0b08fe 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -291,9 +291,6 @@ usb-typec-tcpm-refactor-tcpm_handle_vdm_request.patch usb-typec-bus-verify-partner-exists-in-typec_altmode.patch arm-dts-bcm5301x-extend-ram-to-full-256mb-for-linksy.patch clk-imx8mm-move-1443x-1416x-pll-clock-structure-to-c.patch -clk-imx-clk-pll14xx-make-two-variables-static.patch -clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch -clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch net-ipv4-fix-one-memleak-in-__inet_del_ifa.patch net-ethernet-mvpp2_main-fix-possible-oob-write-in-mv.patch net-ethernet-mtk_eth_soc-fix-possible-null-pointer-d.patch @@ -323,7 +320,6 @@ tpm_tis-resend-command-to-recover-from-data-transfer.patch mmc-sdhci-esdhc-imx-improve-esdhc_flag_err010450.patch alx-fix-oob-read-compiler-warning.patch wifi-mac80211_hwsim-drop-short-frames.patch -libbpf-free-btf_vmlinux-when-closing-bpf_object.patch drm-exynos-fix-a-possible-null-pointer-dereference-d.patch bus-ti-sysc-configure-uart-quirks-for-k3-soc.patch md-raid1-fix-potential-oob-in-raid1_remove_disk.patch