powerpc64/bpf: Implement fsession support
Subsystems (4)
PATCH v3 1/2 powerpc64/bpf: Implement fsession support
From: Abhishek Dubey <[email protected]>
Implement JIT support for fsession in powerpc64 trampoline. The trampoline stack now accommodate session cookies and function metadata in place of function argument. fentry/fexit programs consume corresponding function metadata. This mirrors existing x86 behavior and enable session cookies on powerpc64.
# ./test_progs -t fsession #135/1 fsession_test/fsession_test:OK #135/2 fsession_test/fsession_reattach:OK #135/3 fsession_test/fsession_cookie:OK #135 fsession_test:OK Summary: 1/3 PASSED, 0 SKIPPED, 0 FAILED
---
This patch is rebased over https://lore.kernel.org/bpf/[email protected]
v2->v3:
Rebased over latest changes
Collected Tested-by tagv1->v2:
No change since v1
[v2]: https://lore.kernel.org/bpf/[email protected]
[v1]: https://lore.kernel.org/bpf/[email protected]
arch/powerpc/net/bpf_jit.h | 4 +- arch/powerpc/net/bpf_jit_comp.c | 69 ++++++++++++++++++++++++++----- arch/powerpc/net/bpf_jit_comp64.c | 25 +++++++++++ 3 files changed, 87 insertions(+), 11 deletions(-)
arch/powerpc/net/bpf_jit.h +3 -1
@@ -218,7 +218,9 @@ void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx);void bpf_jit_build_fentry_stubs (u32 *image,struct codegen_context *ctx);void bpf_jit_realloc_regs (struct codegen_context *ctx);int bpf_jit_emit_exit_insn (u32 *image,struct codegen_context *ctx,int tmp_reg,long exit_addr); - +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off); +void store_func_meta (u32 *image,struct codegen_context *ctx,u64 func_meta,int func_meta_off);int bpf_add_extable_entry (struct bpf_prog *fp,u32 *image,u32 *fimage,int pass,struct codegen_context *ctx,int insn_idx,int jmp_off,int dst_reg,u32 code);
arch/powerpc/net/bpf_jit_comp.c +59 -10
133 lines not on this page · raw message
arch/powerpc/net/bpf_jit_comp64.c +25 -0
@@ -179,6 +179,31 @@ static int bpf_jit_stack_offsetof(struct codegen_context *ctx, int reg)BUG (); } +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off) +{ +EMIT (PPC_RAW_LI (bpf_to_ppc (TMP_REG_1 ),0 )); + +for (int i =0 ; i < cookie_cnt; i++) +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, cookie_off +8 * i)); +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, retval_off)); +} + +void store_func_meta (u32 *image,struct codegen_context *ctx, +u64 func_meta,int func_meta_off) +{ +/* +* Store func_meta to stack at [R1 + func_meta_off] = func_meta +* +* func_meta : +* bit[63]: is_return flag +* byte[1]: cookie offset from ctx +* byte[0]: args count +*/ +PPC_LI64 (bpf_to_ppc (TMP_REG_1 ), func_meta); +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, func_meta_off)); +} +void bpf_jit_realloc_regs (struct codegen_context *ctx) { }
Signature · 1 line
2.52.0
PATCH v3 2/2 powerpc32/bpf: Add fsession support
From: Abhishek Dubey <[email protected]>
Extend JIT support of fsession in powerpc64 trampoline, since ppc64 and ppc32 shares common trampoline implementation. Arch specific helpers handle 64-bit data copy using 32 bit regs.
Need to validate fsession support along with trampoline support.
---
v2->v3:
Address comments around PPC_LI32v1->v2:
No change since v1
[v2]: https://lore.kernel.org/bpf/[email protected]
[v1]: https://lore.kernel.org/bpf/[email protected]
arch/powerpc/net/bpf_jit_comp.c | 8 ++++++- arch/powerpc/net/bpf_jit_comp32.c | 35 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-)
arch/powerpc/net/bpf_jit_comp.c +7 -1
@@ -542,7 +542,13 @@ bool bpf_jit_supports_private_stack(void)bool bpf_jit_supports_fsession (void ) { -return IS_ENABLED (CONFIG_PPC64 ); +/* +* TODO: Remove after validating support +* for fsession and trampoline on ppc32. +*/ +if (IS_ENABLED (CONFIG_PPC32 )) +return -EOPNOTSUPP ; +return true; }bool bpf_jit_supports_arena (void )
arch/powerpc/net/bpf_jit_comp32.c +35 -0
@@ -123,6 +123,41 @@ void bpf_jit_realloc_regs(struct codegen_context *ctx) } } +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off) +{ +/* +* Set session cookies value +* Clear cookies field on stack +* Ensure retval to be cleared on fentry +*/ +EMIT (PPC_RAW_LI (bpf_to_ppc (TMP_REG ),0 )); + +for (int i =0 ; i < cookie_cnt; i++) { +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, cookie_off +4 * i)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, cookie_off +4 * i +4 )); + } + +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, retval_off)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, retval_off +4 )); +} + +void store_func_meta (u32 *image,struct codegen_context *ctx, +u64 func_meta,int func_meta_off) +{ +/* +* Store func_meta to stack: [R1 + func_meta_off] = func_meta +* func_meta := argument count in first byte + cookie value +*/ +/* Store lower word */ +EMIT (PPC_RAW_LI32 (bpf_to_ppc (TMP_REG ), (u32 )func_meta)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, func_meta_off)); + +/* Store upper word */ +EMIT (PPC_RAW_LI32 (bpf_to_ppc (TMP_REG ), (u32)(func_meta >>32 ))); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, func_meta_off +4 )); +} +void bpf_jit_build_prologue (u32 *image,struct codegen_context *ctx) {int i;
Signature · 1 line
2.52.0
Re: [PATCH v3 2/2] powerpc32/bpf: Add fsession support
Quoted 8 lines · On 01/04/26 7:40 pm, [email protected] wrote:
From: Abhishek Dubey <[email protected]>
Extend JIT support of fsession in powerpc64 trampoline, since ppc64 and ppc32 shares common trampoline implementation. Arch specific helpers handle 64-bit data copy using 32 bit regs.
Need to validate fsession support along with trampoline support.
LGTM.
Quoted 80 lines
Signed-off-by Abhishek Dubey <[email protected]>---
v2->v3:
Address comments aroundPPC_LI32v1->v2:
No change since v1[v2]: https://lore.kernel.org/bpf/[email protected]
[v1]: https://lore.kernel.org/bpf/[email protected]arch/powerpc/net/bpf_jit_comp.c | 8 ++++++- arch/powerpc/net/bpf_jit_comp32.c | 35 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-)arch/powerpc/net/bpf_jit_comp.c +7
-1@@ -542,7 +542,13 @@ bool bpf_jit_supports_private_stack(void)bool bpf_jit_supports_fsession (void ) { -return IS_ENABLED (CONFIG_PPC64 ); +/* +* TODO: Remove after validating support +* for fsession and trampoline on ppc32. +*/ +if (IS_ENABLED (CONFIG_PPC32 )) +return -EOPNOTSUPP ; +return true; }bool bpf_jit_supports_arena (void )arch/powerpc/net/bpf_jit_comp32.c +35
-0@@ -123,6 +123,41 @@ void bpf_jit_realloc_regs(struct codegen_context *ctx) } } +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off) +{ +/* +* Set session cookies value +* Clear cookies field on stack +* Ensure retval to be cleared on fentry +*/ +EMIT (PPC_RAW_LI (bpf_to_ppc (TMP_REG ),0 )); + +for (int i =0 ; i < cookie_cnt; i++) { +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, cookie_off +4 * i)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, cookie_off +4 * i +4 )); + } + +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, retval_off)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, retval_off +4 )); +} + +void store_func_meta (u32 *image,struct codegen_context *ctx, +u64 func_meta,int func_meta_off) +{ +/* +* Store func_meta to stack: [R1 + func_meta_off] = func_meta +* func_meta := argument count in first byte + cookie value +*/ +/* Store lower word */ +EMIT (PPC_RAW_LI32 (bpf_to_ppc (TMP_REG ), (u32 )func_meta)); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, func_meta_off)); + +/* Store upper word */ +EMIT (PPC_RAW_LI32 (bpf_to_ppc (TMP_REG ), (u32)(func_meta >>32 ))); +EMIT (PPC_RAW_STW (bpf_to_ppc (TMP_REG ), _R1, func_meta_off +4 )); +} +void bpf_jit_build_prologue (u32 *image,struct codegen_context *ctx) {int i;
Quoted 8 lines · On 01/04/26 7:40 pm, [email protected] wrote:
From: Abhishek Dubey <[email protected]>
Implement JIT support for fsession in powerpc64 trampoline. The trampoline stack now accommodate session cookies and function metadata in place of function argument. fentry/fexit programs consume corresponding function metadata. This mirrors existing x86 behavior and enable session cookies on powerpc64.
Quoted 7 lines
# ./test_progs -t fsession #135/1 fsession_test/fsession_test:OK #135/2 fsession_test/fsession_reattach:OK #135/3 fsession_test/fsession_cookie:OK #135 fsession_test:OK Summary: 1/3 PASSED, 0 SKIPPED, 0 FAILED
Looks good to me.
Quoted 215 lines
Signed-off-by Abhishek Dubey <[email protected]>Tested-by Venkat Rao Bagalkote <[email protected]>---
This patch is rebased over https://lore.kernel.org/bpf/[email protected]
v2->v3:
Rebased over latest changes
Collected Tested-by tagv1->v2:
No change since v1[v2]: https://lore.kernel.org/bpf/[email protected]
[v1]: https://lore.kernel.org/bpf/[email protected]arch/powerpc/net/bpf_jit.h | 4 +- arch/powerpc/net/bpf_jit_comp.c | 69 ++++++++++++++++++++++++++----- arch/powerpc/net/bpf_jit_comp64.c | 25 +++++++++++ 3 files changed, 87 insertions(+), 11 deletions(-)arch/powerpc/net/bpf_jit.h +3
-1@@ -218,7 +218,9 @@ void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx);void bpf_jit_build_fentry_stubs (u32 *image,struct codegen_context *ctx);void bpf_jit_realloc_regs (struct codegen_context *ctx);int bpf_jit_emit_exit_insn (u32 *image,struct codegen_context *ctx,int tmp_reg,long exit_addr); - +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off); +void store_func_meta (u32 *image,struct codegen_context *ctx,u64 func_meta,int func_meta_off);int bpf_add_extable_entry (struct bpf_prog *fp,u32 *image,u32 *fimage,int pass,struct codegen_context *ctx,int insn_idx,int jmp_off,int dst_reg,u32 code);arch/powerpc/net/bpf_jit_comp.c +59
-10@@ -540,6 +540,11 @@ bool bpf_jit_supports_private_stack(void)return IS_ENABLED (CONFIG_PPC64 ); } +bool bpf_jit_supports_fsession (void ) +{ +return IS_ENABLED (CONFIG_PPC64 ); +} +bool bpf_jit_supports_arena (void ) {return IS_ENABLED (CONFIG_PPC64 );@@ -812,12 +817,16 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imstruct bpf_tramp_links *tlinks, void *func_addr) { - int regs_off, nregs_off, ip_off, run_ctx_off, retval_off, nvr_off, alt_lr_off, r4_off = 0; + int regs_off, func_meta_off, ip_off, run_ctx_off, retval_off; +int nvr_off, alt_lr_off, r4_off =0 ;struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN ];struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY ];struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT ];int i, ret, nr_regs, retaddr_off, bpf_frame_size =0 ;struct codegen_context codegen_ctx, *ctx; +int cookie_off, cookie_cnt, cookie_ctx_off; +int fsession_cnt =bpf_fsession_cnt (tlinks); +u64 func_meta;u32 *image = (u32 *)rw_image;ppc_inst_t branch_insn;u32 *branches =NULL ;@@ -853,9 +862,11 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im* [ reg argN ] * [ ... ] * regs_off [ reg_arg1 ] prog_ctx -* nregs_off [ args count ] ((u64 *)prog_ctx)[-1] +* func_meta_off [ args count ] ((u64 *)prog_ctx)[-1] * ip_off [ traced function ] ((u64 *)prog_ctx)[-2] +* [ stack cookieN ] * [ ... ] +* cookie_off [ stack cookie1 ] * run_ctx_off [ bpf_tramp_run_ctx ] * [ reg argN ] * [ ... ] @@ -887,16 +898,21 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im run_ctx_off = bpf_frame_size; bpf_frame_size +=round_up (sizeof (struct bpf_tramp_run_ctx ),SZL ); +/* room for session cookies */ + cookie_off = bpf_frame_size; + cookie_cnt =bpf_fsession_cookie_cnt (tlinks); + bpf_frame_size += cookie_cnt *8 ; +/* Room for IP address argument */ ip_off = bpf_frame_size;if (flags &BPF_TRAMP_F_IP_ARG ) bpf_frame_size +=SZL ; -/* Room for args count */ - nregs_off = bpf_frame_size; +/* Room for function metadata, arg regs count */ + func_meta_off = bpf_frame_size; bpf_frame_size +=SZL ; -/* Room for args */ +/* Room for arg regs */ regs_off = bpf_frame_size; bpf_frame_size += nr_regs *SZL ;@@ -995,9 +1011,9 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imEMIT (PPC_RAW_STL (_R3, _R1, retaddr_off)); } -/* Save function arg count -- see bpf_get_func_arg_cnt() */ -EMIT (PPC_RAW_LI (_R3, nr_regs)); -EMIT (PPC_RAW_STL (_R3, _R1, nregs_off)); +/* Save function arg regs count -- see bpf_get_func_arg_cnt() */ + func_meta = nr_regs; +store_func_meta (image, ctx, func_meta, func_meta_off);/* Save nv regs */ EMIT (PPC_RAW_STL (_R25, _R1, nvr_off));@@ -1011,10 +1027,28 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imreturn ret; } -for (i =0 ; i < fentry->nr_links; i++) +if (fsession_cnt) { +/* +* Clear all the session cookies' values +* Clear the return value to make sure fentry always get 0 +*/ +prepare_for_fsession_fentry (image, ctx, cookie_cnt, cookie_off, retval_off); + } + + cookie_ctx_off = (regs_off - cookie_off) /8 ; + +for (i =0 ; i < fentry->nr_links; i++) { +if (bpf_prog_calls_session_cookie (fentry->links[i])) { +u64 meta = func_meta | (cookie_ctx_off <<BPF_TRAMP_COOKIE_INDEX_SHIFT ); + +store_func_meta (image, ctx, meta, func_meta_off); + cookie_ctx_off--; + } +if (invoke_bpf_prog (image, ro_image, ctx, fentry->links[i], regs_off, retval_off, run_ctx_off, flags &BPF_TRAMP_F_RET_FENTRY_RET ))return -EINVAL ; + }if (fmod_ret->nr_links) { branches =kcalloc (fmod_ret->nr_links,sizeof (u32),GFP_KERNEL );@@ -1076,12 +1110,27 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_im image[branches[i]] =ppc_inst_val (branch_insn); } -for (i =0 ; i < fexit->nr_links; i++) +/* set the "is_return" flag for fsession */ + func_meta |= (1ULL <<BPF_TRAMP_IS_RETURN_SHIFT ); +if (fsession_cnt) +store_func_meta (image, ctx, func_meta, func_meta_off); + + cookie_ctx_off = (regs_off - cookie_off) /8 ; + +for (i =0 ; i < fexit->nr_links; i++) { +if (bpf_prog_calls_session_cookie (fexit->links[i])) { +u64 meta = func_meta | (cookie_ctx_off <<BPF_TRAMP_COOKIE_INDEX_SHIFT ); + +store_func_meta (image, ctx, meta, func_meta_off); + cookie_ctx_off--; + } +if (invoke_bpf_prog (image, ro_image, ctx, fexit->links[i], regs_off, retval_off, run_ctx_off, false)) { ret = -EINVAL ; goto cleanup; } + }if (flags &BPF_TRAMP_F_CALL_ORIG ) {if (ro_image)/* image is NULL for dummy pass */ arch/powerpc/net/bpf_jit_comp64.c +25
-0@@ -179,6 +179,31 @@ static int bpf_jit_stack_offsetof(struct codegen_context *ctx, int reg)BUG (); } +void prepare_for_fsession_fentry (u32 *image,struct codegen_context *ctx,int cookie_cnt, +int cookie_off,int retval_off) +{ +EMIT (PPC_RAW_LI (bpf_to_ppc (TMP_REG_1 ),0 )); + +for (int i =0 ; i < cookie_cnt; i++) +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, cookie_off +8 * i)); +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, retval_off)); +} + +void store_func_meta (u32 *image,struct codegen_context *ctx, +u64 func_meta,int func_meta_off) +{ +/* +* Store func_meta to stack at [R1 + func_meta_off] = func_meta +* +* func_meta : +* bit[63]: is_return flag +* byte[1]: cookie offset from ctx +* byte[0]: args count +*/ +PPC_LI64 (bpf_to_ppc (TMP_REG_1 ), func_meta); +EMIT (PPC_RAW_STD (bpf_to_ppc (TMP_REG_1 ), _R1, func_meta_off)); +} +void bpf_jit_realloc_regs (struct codegen_context *ctx) { }
Quoted 6 lines · On Wed, 01 Apr 2026 10:10:42 -0400, [email protected] wrote:
Implement JIT support for fsession in powerpc64 trampoline. The trampoline stack now accommodate session cookies and function metadata in place of function argument. fentry/fexit programs consume corresponding function metadata. This mirrors existing x86 behavior and enable session cookies on powerpc64.
Quoted 8 lines
# ./test_progs -t fsession #135/1 fsession_test/fsession_test:OK #135/2 fsession_test/fsession_reattach:OK #135/3 fsession_test/fsession_cookie:OK #135 fsession_test:OK Summary: 1/3 PASSED, 0 SKIPPED, 0 FAILED[...]
Applied to powerpc/next.
[1/2] powerpc64/bpf: Implement fsession support
https://git.kernel.org/powerpc/c/6fab063bd8d64f15cde2d194c08a159ad3afdf27 [2/2] powerpc32/bpf: Add fsession support https://git.kernel.org/powerpc/c/92258b5bf1ec10204c23a793793a65dc92d17014
cheers