bpf: fsession support for riscv
Subsystems (5)
v4 cover bpf: fsession support for riscv
Implement bpf fsession for the riscv architecture.
Changes v4 -> v3:
* fix the build error
* v3: https://lore.kernel.org/bpf/[email protected]/
Changes v3 -> v2:
* fix some comments.
* v2: https://lore.kernel.org/bpf/[email protected]/T/#t
Changes v2 -> v1:
* use bpf_prog_calls_session_cookie() in invoke_bpf() in the 2nd patch.
* v1: https://lore.kernel.org/bpf/[email protected]/
Menglong Dong (3):
bpf, riscv: introduce emit_store_stack_imm64() for trampoline bpf, riscv: add fsession support for trampolines selftests/bpf: enable fsession_test on riscv64
arch/riscv/net/bpf_jit_comp64.c | 97 +++++++++++++++---- .../selftests/bpf/progs/get_func_args_test.c | 2 +- .../selftests/bpf/progs/get_func_ip_test.c | 2 +- 3 files changed, 79 insertions(+), 22 deletions(-)
Signature · 1 line
2.53.0
PATCH v4 1/3 bpf, riscv: introduce emit_store_stack_imm64() for trampoline
Introduce a helper to store 64-bit immediate on the trampoline stack with a help of a register.
--- arch/riscv/net/bpf_jit_comp64.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +14 -11
@@ -926,6 +926,14 @@ static void restore_stack_args(int nr_stack_args, int args_off, int stk_arg_off, } } +static void emit_store_stack_imm64 (u8 reg,int stack_off,u64 imm64, +struct rv_jit_context *ctx) +{ +/* Load imm64 into reg and store it at [FP + stack_off]. */ +emit_imm (reg, (s64 )imm64, ctx); +emit_sd (RV_REG_FP , stack_off, reg, ctx); +} +static int invoke_bpf_prog (struct bpf_tramp_link *l,int args_off,int retval_off,int run_ctx_off,bool save_ret,struct rv_jit_context *ctx) {
@@ -933,12 +941,10 @@ static int invoke_bpf_prog(struct bpf_tramp_link *l, int args_off, int retval_ofstruct bpf_prog *p = l->link.prog;int cookie_off = offsetof(struct bpf_tramp_run_ctx , bpf_cookie); -if (l->cookie) { -emit_imm (RV_REG_T1 , l->cookie, ctx); -emit_sd (RV_REG_FP , -run_ctx_off + cookie_off,RV_REG_T1 , ctx); - }else { +if (l->cookie) +emit_store_stack_imm64 (RV_REG_T1 , -run_ctx_off + cookie_off, l->cookie, ctx); +else emit_sd (RV_REG_FP , -run_ctx_off + cookie_off,RV_REG_ZERO , ctx); - }/* arg1: prog */ emit_imm (RV_REG_A0 , (const s64 )p, ctx);
@@ -1123,13 +1129,10 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,emit_sd (RV_REG_FP , -sreg_off,RV_REG_S1 , ctx);/* store ip address of the traced function */ -if (flags &BPF_TRAMP_F_IP_ARG ) { -emit_imm (RV_REG_T1 , (const s64 )func_addr, ctx); -emit_sd (RV_REG_FP , -ip_off,RV_REG_T1 , ctx); - } +if (flags &BPF_TRAMP_F_IP_ARG ) +emit_store_stack_imm64 (RV_REG_T1 , -ip_off, (u64 )func_addr, ctx); -emit_li (RV_REG_T1 , nr_arg_slots, ctx); -emit_sd (RV_REG_FP , -nregs_off,RV_REG_T1 , ctx); +emit_store_stack_imm64 (RV_REG_T1 , -nregs_off, nr_arg_slots, ctx);store_args (nr_arg_slots, args_off, ctx);
Signature · 1 line
2.53.0
PATCH v4 2/3 bpf, riscv: add fsession support for trampolines
In reply to Menglong DongImplement BPF_TRACE_FSESSION support in the RISC-V trampoline JIT. The logic here is similar to what we did in x86_64.
In order to simply the logic, we factor out the function invoke_bpf() for fentry and fexit.
---
v4:
- fix the build error
v3:
- remove the "always" from the comment
v2:
- use bpf_prog_calls_session_cookie() in invoke_bpf()
--- arch/riscv/net/bpf_jit_comp64.c | 74 ++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 10 deletions(-)
arch/riscv/net/bpf_jit_comp64.c +64 -10
@@ -996,6 +996,29 @@ static int invoke_bpf_prog(struct bpf_tramp_link *l, int args_off, int retval_ofreturn ret; } +static int invoke_bpf (struct bpf_tramp_links *tl,int args_off,int retval_off, +int run_ctx_off,int func_meta_off,bool save_ret,u64 func_meta, +int cookie_off,struct rv_jit_context *ctx) +{ +int i, cur_cookie = (cookie_off - args_off) /8 ; + +for (i =0 ; i < tl->nr_links; i++) { +int err; + +if (bpf_prog_calls_session_cookie (tl->links[i])) { +u64 meta = func_meta | ((u64 )cur_cookie <<BPF_TRAMP_COOKIE_INDEX_SHIFT ); + +emit_store_stack_imm64 (RV_REG_T1 , -func_meta_off, meta, ctx); + cur_cookie--; + } + err =invoke_bpf_prog (tl->links[i], args_off, retval_off, run_ctx_off, + save_ret, ctx); +if (err) +return err; + } +return 0 ; +} + static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, const struct btf_func_model *m, struct bpf_tramp_links *tlinks,
@@ -1005,13 +1028,15 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,int i, ret, offset;int *branches_off =NULL ;int stack_size =0 , nr_arg_slots =0 ; -int retval_off, args_off, nregs_off, ip_off, run_ctx_off, sreg_off, stk_arg_off; +int retval_off, args_off, func_meta_off, ip_off, run_ctx_off, sreg_off, stk_arg_off; +int cookie_off, cookie_cnt;struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY ];struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT ];struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN ];bool is_struct_ops = flags &BPF_TRAMP_F_INDIRECT ;void *orig_call = func_addr;bool save_ret; +u64 func_meta;u32 insn;/* Two types of generated trampoline stack layout:
@@ -1042,10 +1067,14 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,* [ ... ] * FP - args_off [ arg1 ] * -* FP - nregs_off [ regs count ] +* FP - func_meta_off [ regs count, etc ] * * FP - ip_off [ traced func ] BPF_TRAMP_F_IP_ARG * +* [ stack cookie N ] +* [ ... ] +* FP - cookie_off [ stack cookie 1 ] +* * FP - run_ctx_off [ bpf_tramp_run_ctx ] * * FP - sreg_off [ callee saved reg ]
@@ -1077,14 +1106,20 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, stack_size += nr_arg_slots *8 ; args_off = stack_size; +/* function metadata, such as regs count */ stack_size +=8 ; - nregs_off = stack_size; + func_meta_off = stack_size;if (flags &BPF_TRAMP_F_IP_ARG ) { stack_size +=8 ; ip_off = stack_size; } + cookie_cnt =bpf_fsession_cookie_cnt (tlinks); +/* room for session cookies */ + stack_size += cookie_cnt *8 ; + cookie_off = stack_size; + stack_size +=round_up (sizeof (struct bpf_tramp_run_ctx ),8 ); run_ctx_off = stack_size;
@@ -1132,10 +1167,19 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,if (flags &BPF_TRAMP_F_IP_ARG )emit_store_stack_imm64 (RV_REG_T1 , -ip_off, (u64 )func_addr, ctx); -emit_store_stack_imm64 (RV_REG_T1 , -nregs_off, nr_arg_slots, ctx); + func_meta = nr_arg_slots; +emit_store_stack_imm64 (RV_REG_T1 , -func_meta_off, func_meta, ctx);store_args (nr_arg_slots, args_off, ctx); +if (bpf_fsession_cnt (tlinks)) { +/* clear all session cookies' value */ +for (i =0 ; i < cookie_cnt; i++) +emit_sd (RV_REG_FP , -cookie_off +8 * i,RV_REG_ZERO , ctx); +/* clear return value to make sure fentry always get 0 */ +emit_sd (RV_REG_FP , -retval_off,RV_REG_ZERO , ctx); + } +if (flags &BPF_TRAMP_F_CALL_ORIG ) {emit_imm (RV_REG_A0 , ctx->insns ? (const s64 )im :RV_MAX_COUNT_IMM , ctx); ret =emit_call ((const u64 )__bpf_tramp_enter, true, ctx);
@@ -1143,9 +1187,9 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,return ret; } -for (i =0 ; i < fentry->nr_links; i++) { - ret =invoke_bpf_prog (fentry->links[i], args_off, retval_off, run_ctx_off, - flags &BPF_TRAMP_F_RET_FENTRY_RET , ctx); +if (fentry->nr_links) { + ret =invoke_bpf (fentry, args_off, retval_off, run_ctx_off, func_meta_off, + flags &BPF_TRAMP_F_RET_FENTRY_RET , func_meta, cookie_off, ctx);if (ret)return ret; }
@@ -1192,9 +1236,14 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, *(u32 *)(ctx->insns + branches_off[i]) = insn; } -for (i =0 ; i < fexit->nr_links; i++) { - ret =invoke_bpf_prog (fexit->links[i], args_off, retval_off, - run_ctx_off, false, ctx); +/* set "is_return" flag for fsession */ + func_meta |= (1ULL <<BPF_TRAMP_IS_RETURN_SHIFT ); +if (bpf_fsession_cnt (tlinks)) +emit_store_stack_imm64 (RV_REG_T1 , -func_meta_off, func_meta, ctx); + +if (fexit->nr_links) { + ret =invoke_bpf (fexit, args_off, retval_off, run_ctx_off, func_meta_off, + false, func_meta, cookie_off, ctx);if (ret) goto out; }
@@ -2094,3 +2143,8 @@ bool bpf_jit_inlines_helper_call(s32 imm)return false; } } + +bool bpf_jit_supports_fsession (void ) +{ +return true; +}
Signature · 1 line
2.53.0
PATCH v4 3/3 selftests/bpf: enable fsession_test on riscv64
In reply to Menglong DongNow that the RISC-V trampoline JIT supports BPF_TRACE_FSESSION, run the fsession selftest on riscv64 as well as x86_64.
--- tools/testing/selftests/bpf/progs/get_func_args_test.c | 2 +- tools/testing/selftests/bpf/progs/get_func_ip_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/progs/get_func_args_test.c +1 -1
@@ -167,7 +167,7 @@ int BPF_PROG(tp_test2) }__u64 test7_result =0 ; -#if defined(bpf_target_x86) || defined(bpf_target_arm64) +#if defined(bpf_target_x86) || defined(bpf_target_arm64) || defined(bpf_target_riscv) SEC("fsession/bpf_fentry_test1")int BPF_PROG (test7 ) {
tools/testing/selftests/bpf/progs/get_func_ip_test.c +1 -1
@@ -106,7 +106,7 @@ int BPF_URETPROBE(test8, int ret)__u64 test9_entry_result =0 ;__u64 test9_exit_result =0 ; -#if defined(bpf_target_x86) || defined(bpf_target_arm64) +#if defined(bpf_target_x86) || defined(bpf_target_arm64) || defined(bpf_target_riscv) SEC("fsession/bpf_fentry_test1")int BPF_PROG (test9 ,int a) {
Signature · 1 line
2.53.0
Quoted 19 lines · Menglong Dong
Implement bpf fsession for the riscv architecture.
Changes v4 -> v3:
* fix the build error
* v3: https://lore.kernel.org/bpf/[email protected]/Changes v3 -> v2:
* fix some comments.
* v2: https://lore.kernel.org/bpf/[email protected]/T/#tChanges v2 -> v1:
* usebpf_prog_calls_session_cookie()ininvoke_bpf()in the 2nd patch.
* v1: https://lore.kernel.org/bpf/[email protected]/Menglong Dong (3):
bpf, riscv: introduceemit_store_stack_imm64()for trampoline bpf, riscv: add fsession support for trampolines selftests/bpf: enablefsession_teston riscv64
Quoted 5 lines
arch/riscv/net/bpf_jit_comp64.c | 97 +++++++++++++++---- .../selftests/bpf/progs/get_func_args_test.c | 2 +- .../selftests/bpf/progs/get_func_ip_test.c | 2 +- 3 files changed, 79 insertions(+), 22 deletions(-)
looks good to me, feel free to add
This series was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Sun, 8 Feb 2026 13:33:08 +0800 you wrote:
Implement bpf fsession for the riscv architecture.
Changes v4 -> v3:
* fix the build error
* v3: https://lore.kernel.org/bpf/[email protected]/Changes v3 -> v2:
* fix some comments.
* v2: https://lore.kernel.org/bpf/[email protected]/T/#t[...]
Here is the summary with links:
- [bpf-next,v4,1/3] bpf, riscv: introduce emit_store_stack_imm64() for trampoline
https://git.kernel.org/bpf/bpf/c/63ad3d614241 - [bpf-next,v4,2/3] bpf, riscv: add fsession support for trampolines https://git.kernel.org/bpf/bpf/c/2277c14bc90b - [bpf-next,v4,3/3] selftests/bpf: enable fsession_test on riscv64 https://git.kernel.org/bpf/bpf/c/5749b6532b4c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
This series was applied to riscv/linux.git (for-next) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Alexei Starovoitov <[email protected]>:
Quoted 11 lines · On Sun, 8 Feb 2026 13:33:08 +0800 you wrote:
Implement bpf fsession for the riscv architecture.
Changes v4 -> v3:
* fix the build error
* v3: https://lore.kernel.org/bpf/[email protected]/Changes v3 -> v2:
* fix some comments.
* v2: https://lore.kernel.org/bpf/[email protected]/T/#t[...]
Here is the summary with links:
- [bpf-next,v4,1/3] bpf, riscv: introduce emit_store_stack_imm64() for trampoline
https://git.kernel.org/riscv/c/93fd420d71be - [bpf-next,v4,2/3] bpf, riscv: add fsession support for trampolines https://git.kernel.org/riscv/c/35b3515be0ec
- [bpf-next,v4,3/3] selftests/bpf: enable fsession_test on riscv64 (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html