From: Greg Kroah-Hartman Date: Thu, 1 May 2025 07:58:28 +0000 (+0200) Subject: drop riscv patch from 6.6, 6.1, and 5.15 queues X-Git-Tag: v5.4.293~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a93aa99e111c5e9a379752922b54cadd0905644;p=thirdparty%2Fkernel%2Fstable-queue.git drop riscv patch from 6.6, 6.1, and 5.15 queues --- diff --git a/queue-5.15/riscv-uprobes-add-missing-fence.i-after-building-the.patch b/queue-5.15/riscv-uprobes-add-missing-fence.i-after-building-the.patch deleted file mode 100644 index 640ec0d3ec..0000000000 --- a/queue-5.15/riscv-uprobes-add-missing-fence.i-after-building-the.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c36385343b412dfb450f879a77ff414da4ebfafc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 19 Apr 2025 13:14:00 +0200 -Subject: riscv: uprobes: Add missing fence.i after building the XOL buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Björn Töpel - -[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ] - -The XOL (execute out-of-line) buffer is used to single-step the -replaced instruction(s) for uprobes. The RISC-V port was missing a -proper fence.i (i$ flushing) after constructing the XOL buffer, which -can result in incorrect execution of stale/broken instructions. - -This was found running the BPF selftests "test_progs: -uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the -uprobes tests randomly blew up. - -Reviewed-by: Guo Ren -Fixes: 74784081aac8 ("riscv: Add uprobes supported") -Signed-off-by: Björn Töpel -Link: https://lore.kernel.org/r/20250419111402.1660267-2-bjorn@kernel.org -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/kernel/probes/uprobes.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c -index 194f166b2cc40..0d18ee53fd649 100644 ---- a/arch/riscv/kernel/probes/uprobes.c -+++ b/arch/riscv/kernel/probes/uprobes.c -@@ -161,6 +161,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - /* Initialize the slot */ - void *kaddr = kmap_atomic(page); - void *dst = kaddr + (vaddr & ~PAGE_MASK); -+ unsigned long start = (unsigned long)dst; - - memcpy(dst, src, len); - -@@ -170,13 +171,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - *(uprobe_opcode_t *)dst = __BUG_INSN_32; - } - -+ flush_icache_range(start, start + len); - kunmap_atomic(kaddr); -- -- /* -- * We probably need flush_icache_user_page() but it needs vma. -- * This should work on most of architectures by default. If -- * architecture needs to do something different it can define -- * its own version of the function. -- */ -- flush_dcache_page(page); - } --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 6afee12b9c..6ac97a65ac 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -293,7 +293,6 @@ net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch -riscv-uprobes-add-missing-fence.i-after-building-the.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch drm-amd-display-fix-gpu-reset-in-multidisplay-config.patch diff --git a/queue-6.1/riscv-uprobes-add-missing-fence.i-after-building-the.patch b/queue-6.1/riscv-uprobes-add-missing-fence.i-after-building-the.patch deleted file mode 100644 index 815eca59c7..0000000000 --- a/queue-6.1/riscv-uprobes-add-missing-fence.i-after-building-the.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ccd18ae73bffa825652610b0f927a8087ba88d7d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 19 Apr 2025 13:14:00 +0200 -Subject: riscv: uprobes: Add missing fence.i after building the XOL buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Björn Töpel - -[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ] - -The XOL (execute out-of-line) buffer is used to single-step the -replaced instruction(s) for uprobes. The RISC-V port was missing a -proper fence.i (i$ flushing) after constructing the XOL buffer, which -can result in incorrect execution of stale/broken instructions. - -This was found running the BPF selftests "test_progs: -uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the -uprobes tests randomly blew up. - -Reviewed-by: Guo Ren -Fixes: 74784081aac8 ("riscv: Add uprobes supported") -Signed-off-by: Björn Töpel -Link: https://lore.kernel.org/r/20250419111402.1660267-2-bjorn@kernel.org -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/kernel/probes/uprobes.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c -index 194f166b2cc40..0d18ee53fd649 100644 ---- a/arch/riscv/kernel/probes/uprobes.c -+++ b/arch/riscv/kernel/probes/uprobes.c -@@ -161,6 +161,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - /* Initialize the slot */ - void *kaddr = kmap_atomic(page); - void *dst = kaddr + (vaddr & ~PAGE_MASK); -+ unsigned long start = (unsigned long)dst; - - memcpy(dst, src, len); - -@@ -170,13 +171,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - *(uprobe_opcode_t *)dst = __BUG_INSN_32; - } - -+ flush_icache_range(start, start + len); - kunmap_atomic(kaddr); -- -- /* -- * We probably need flush_icache_user_page() but it needs vma. -- * This should work on most of architectures by default. If -- * architecture needs to do something different it can define -- * its own version of the function. -- */ -- flush_dcache_page(page); - } --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index abf3002a70..71327d50dd 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -46,7 +46,6 @@ net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch -riscv-uprobes-add-missing-fence.i-after-building-the.patch perf-x86-fix-non-sampling-counting-events-on-certain.patch loongarch-select-arch_use_memtest.patch loongarch-make-regs_irqs_disabled-more-clear.patch diff --git a/queue-6.6/riscv-uprobes-add-missing-fence.i-after-building-the.patch b/queue-6.6/riscv-uprobes-add-missing-fence.i-after-building-the.patch deleted file mode 100644 index da8e371966..0000000000 --- a/queue-6.6/riscv-uprobes-add-missing-fence.i-after-building-the.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a46de9ef93f43ebd6576e743e546ac36dee3e3cb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 19 Apr 2025 13:14:00 +0200 -Subject: riscv: uprobes: Add missing fence.i after building the XOL buffer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Björn Töpel - -[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ] - -The XOL (execute out-of-line) buffer is used to single-step the -replaced instruction(s) for uprobes. The RISC-V port was missing a -proper fence.i (i$ flushing) after constructing the XOL buffer, which -can result in incorrect execution of stale/broken instructions. - -This was found running the BPF selftests "test_progs: -uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the -uprobes tests randomly blew up. - -Reviewed-by: Guo Ren -Fixes: 74784081aac8 ("riscv: Add uprobes supported") -Signed-off-by: Björn Töpel -Link: https://lore.kernel.org/r/20250419111402.1660267-2-bjorn@kernel.org -Signed-off-by: Palmer Dabbelt -Signed-off-by: Sasha Levin ---- - arch/riscv/kernel/probes/uprobes.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c -index 4b3dc8beaf77d..cc15f7ca6cc17 100644 ---- a/arch/riscv/kernel/probes/uprobes.c -+++ b/arch/riscv/kernel/probes/uprobes.c -@@ -167,6 +167,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - /* Initialize the slot */ - void *kaddr = kmap_atomic(page); - void *dst = kaddr + (vaddr & ~PAGE_MASK); -+ unsigned long start = (unsigned long)dst; - - memcpy(dst, src, len); - -@@ -176,13 +177,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, - *(uprobe_opcode_t *)dst = __BUG_INSN_32; - } - -+ flush_icache_range(start, start + len); - kunmap_atomic(kaddr); -- -- /* -- * We probably need flush_icache_user_page() but it needs vma. -- * This should work on most of architectures by default. If -- * architecture needs to do something different it can define -- * its own version of the function. -- */ -- flush_dcache_page(page); - } --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index c6b29b5b0a..e623d42585 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -57,7 +57,6 @@ pds_core-handle-unsupported-pds_core_cmd_fw_control-.patch pds_core-remove-unnecessary-check-in-pds_client_admi.patch pds_core-make-wait_context-part-of-q_info.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch -riscv-uprobes-add-missing-fence.i-after-building-the.patch splice-remove-duplicate-noinline-from-pipe_clear_now.patch perf-x86-fix-non-sampling-counting-events-on-certain.patch loongarch-select-arch_use_memtest.patch