drop a powerpc patch for 6.6

diff --git a/queue-6.6/powerpc-64-bpf-fix-tail-calls-for-pcrel-addressing.patch b/queue-6.6/powerpc-64-bpf-fix-tail-calls-for-pcrel-addressing.patch
deleted file mode 100644 (file)
index 0ab77fd..0000000
--- a/queue-6.6/powerpc-64-bpf-fix-tail-calls-for-pcrel-addressing.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 2ecfe59cd7de1f202e9af2516a61fbbf93d0bd4d Mon Sep 17 00:00:00 2001
-From: Hari Bathini <hbathini@linux.ibm.com>
-Date: Thu, 2 May 2024 23:02:04 +0530
-Subject: powerpc/64/bpf: fix tail calls for PCREL addressing
-
-From: Hari Bathini <hbathini@linux.ibm.com>
-
-commit 2ecfe59cd7de1f202e9af2516a61fbbf93d0bd4d upstream.
-
-With PCREL addressing, there is no kernel TOC. So, it is not setup in
-prologue when PCREL addressing is used. But the number of instructions
-to skip on a tail call was not adjusted accordingly. That resulted in
-not so obvious failures while using tailcalls. 'tailcalls' selftest
-crashed the system with the below call trace:
-
-  bpf_test_run+0xe8/0x3cc (unreliable)
-  bpf_prog_test_run_skb+0x348/0x778
-  __sys_bpf+0xb04/0x2b00
-  sys_bpf+0x28/0x38
-  system_call_exception+0x168/0x340
-  system_call_vectored_common+0x15c/0x2ec
-
-Also, as bpf programs are always module addresses and a bpf helper in
-general is a core kernel text address, using PC relative addressing
-often fails with "out of range of pcrel address" error. Switch to
-using kernel base for relative addressing to handle this better.
-
-Fixes: 7e3a68be42e1 ("powerpc/64: vmlinux support building with PCREL addresing")
-Cc: stable@vger.kernel.org # v6.4+
-Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://msgid.link/20240502173205.142794-1-hbathini@linux.ibm.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/powerpc/net/bpf_jit_comp64.c |   30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
---- a/arch/powerpc/net/bpf_jit_comp64.c
-+++ b/arch/powerpc/net/bpf_jit_comp64.c
-@@ -202,7 +202,8 @@ void bpf_jit_build_epilogue(u32 *image,
-       EMIT(PPC_RAW_BLR());
- }
- 
--static int bpf_jit_emit_func_call_hlp(u32 *image, struct codegen_context *ctx, u64 func)
-+static int
-+bpf_jit_emit_func_call_hlp(u32 *image, u32 *fimage, struct codegen_context *ctx, u64 func)
- {
-       unsigned long func_addr = func ? ppc_function_entry((void *)func) : 0;
-       long reladdr;
-@@ -211,19 +212,20 @@ static int bpf_jit_emit_func_call_hlp(u3
-               return -EINVAL;
- 
-       if (IS_ENABLED(CONFIG_PPC_KERNEL_PCREL)) {
--              reladdr = func_addr - CTX_NIA(ctx);
-+              reladdr = func_addr - local_paca->kernelbase;
- 
-               if (reladdr >= (long)SZ_8G || reladdr < -(long)SZ_8G) {
--                      pr_err("eBPF: address of %ps out of range of pcrel address.\n",
--                              (void *)func);
-+                      pr_err("eBPF: address of %ps out of range of 34-bit relative address.\n",
-+                             (void *)func);
-                       return -ERANGE;
-               }
--              /* pla r12,addr */
--              EMIT(PPC_PREFIX_MLS | __PPC_PRFX_R(1) | IMM_H18(reladdr));
--              EMIT(PPC_INST_PADDI | ___PPC_RT(_R12) | IMM_L(reladdr));
--              EMIT(PPC_RAW_MTCTR(_R12));
--              EMIT(PPC_RAW_BCTR());
--
-+              EMIT(PPC_RAW_LD(_R12, _R13, offsetof(struct paca_struct, kernelbase)));
-+              /* Align for subsequent prefix instruction */
-+              if (!IS_ALIGNED((unsigned long)fimage + CTX_NIA(ctx), 8))
-+                      EMIT(PPC_RAW_NOP());
-+              /* paddi r12,r12,addr */
-+              EMIT(PPC_PREFIX_MLS | __PPC_PRFX_R(0) | IMM_H18(reladdr));
-+              EMIT(PPC_INST_PADDI | ___PPC_RT(_R12) | ___PPC_RA(_R12) | IMM_L(reladdr));
-       } else {
-               reladdr = func_addr - kernel_toc_addr();
-               if (reladdr > 0x7FFFFFFF || reladdr < -(0x80000000L)) {
-@@ -233,9 +235,9 @@ static int bpf_jit_emit_func_call_hlp(u3
- 
-               EMIT(PPC_RAW_ADDIS(_R12, _R2, PPC_HA(reladdr)));
-               EMIT(PPC_RAW_ADDI(_R12, _R12, PPC_LO(reladdr)));
--              EMIT(PPC_RAW_MTCTR(_R12));
--              EMIT(PPC_RAW_BCTRL());
-       }
-+      EMIT(PPC_RAW_MTCTR(_R12));
-+      EMIT(PPC_RAW_BCTRL());
- 
-       return 0;
- }
-@@ -285,7 +287,7 @@ static int bpf_jit_emit_tail_call(u32 *i
-       int b2p_index = bpf_to_ppc(BPF_REG_3);
-       int bpf_tailcall_prologue_size = 8;
- 
--      if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))
-+      if (!IS_ENABLED(CONFIG_PPC_KERNEL_PCREL) && IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))
-               bpf_tailcall_prologue_size += 4; /* skip past the toc load */
- 
-       /*
-@@ -993,7 +995,7 @@ emit_clear:
-                               return ret;
- 
-                       if (func_addr_fixed)
--                              ret = bpf_jit_emit_func_call_hlp(image, ctx, func_addr);
-+                              ret = bpf_jit_emit_func_call_hlp(image, fimage, ctx, func_addr);
-                       else
-                               ret = bpf_jit_emit_func_call_rel(image, ctx, func_addr);
- 

diff --git a/queue-6.6/powerpc-bpf-enforce-full-ordering-for-atomic-operations-with-bpf_fetch.patch b/queue-6.6/powerpc-bpf-enforce-full-ordering-for-atomic-operations-with-bpf_fetch.patch
index dd57eca5b494c7024f63057b5f2c37b243a16f9e..5bf4a829d3c9300e5c78fc1ed4e4bd78873e3263 100644 (file)
--- a/queue-6.6/powerpc-bpf-enforce-full-ordering-for-atomic-operations-with-bpf_fetch.patch
+++ b/queue-6.6/powerpc-bpf-enforce-full-ordering-for-atomic-operations-with-bpf_fetch.patch
@@ -110,7 +110,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                                        EMIT(PPC_RAW_LI(ret_reg - 1, 0)); /* higher 32-bit */
 --- a/arch/powerpc/net/bpf_jit_comp64.c
 +++ b/arch/powerpc/net/bpf_jit_comp64.c
-@@ -805,6 +805,15 @@ emit_clear:
+@@ -803,6 +803,15 @@ emit_clear:
  
                        /* Get offset into TMP_REG_1 */
                        EMIT(PPC_RAW_LI(tmp1_reg, off));
@@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        tmp_idx = ctx->idx * 4;
                        /* load value from memory into TMP_REG_2 */
                        if (size == BPF_DW)
-@@ -867,6 +876,9 @@ emit_clear:
+@@ -865,6 +874,9 @@ emit_clear:
                        PPC_BCC_SHORT(COND_NE, tmp_idx);
  
                        if (imm & BPF_FETCH) {

diff --git a/queue-6.6/series b/queue-6.6/series
index 9c53fd17214b66c3b8694b917c3c716556183d13..e46106ce743d21dde839fb5ed1afd4fcd073f85a 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -130,7 +130,6 @@ tracefs-clear-event_inode-flag-in-tracefs_drop_inode.patch
 btrfs-fix-crash-on-racing-fsync-and-size-extending-write-into-prealloc.patch
 btrfs-fix-leak-of-qgroup-extent-records-after-transaction-abort.patch
 alsa-seq-fix-incorrect-ump-type-for-system-messages.patch
-powerpc-64-bpf-fix-tail-calls-for-pcrel-addressing.patch
 powerpc-bpf-enforce-full-ordering-for-atomic-operations-with-bpf_fetch.patch
 smb-client-fix-deadlock-in-smb2_find_smb_tcon.patch
 selftests-net-more-strict-check-in-net_helper.patch