Add arena argument support to kfuncs and struct_ops
Subsystems (8)
Kumar Kartikeya Dwivedi
maintainerv5 cover Add arena argument support to kfuncs and struct_ops
This is a continuation of patches in [0], with mostly minor changes and reordering. The motivation is covered in that link. A major change is moving to two tags (__arena and __arena__nullable) and moving the changes to JIT to emit more optimized sequences.
Please see commit logs for details.
[0]: https://lore.kernel.org/bpf/[email protected]
Changelog:
----------
v4 -> v5
v4: https://lore.kernel.org/bpf/[email protected]
* Remove the redundant patch-8 capability comment and duplicate nullable kfunc test coverage. (Eduard)
* Introduce the final bpf_tramp_arena_base() interface directly with function-model argument flags, avoiding temporary slot bitmaps and arena_nullable state; simplify struct_ops pointer validation. (Eduard)
* Simplify kfunc arena nullability classification by using the common nullable path for both arena suffixes while leaving the function model to distinguish JIT NULL preservation. (Amery)
* Keep bpf_prog_has_arena_ctx_arg() in bpf_verifier.h from its introduction so trampoline and verifier users share one inline definition, avoiding BPF_JIT/BPF_SYSCALL link dependencies. (Eduard, BPF CI Bot)
* Reject both tracing and extension attachments to struct_ops programs with arena context arguments, and add fentry, fexit, and freplace rejection tests. (Eduard, Sashiko)
v3 -> v4
v3: https://lore.kernel.org/bpf/[email protected]
* Rename __arena_nullable to __arena__nullable and prioritize the composite suffix over __nullable during argument classification. (Sashiko, Eduard)
* Resolve instructions before collecting subprograms and kfuncs so kfunc prototype validation can use associated arena state.
* Move the arena kfunc and JIT-sequence test entry points into prog_tests/verifier.c. (Eduard)
* Match the generated L0 target and call in nullable JIT assertions. (Eduard)
* Route arena kfunc validation through the common argument-checking path. (Amery)
* Reuse btf_func_model argument flags for struct_ops arena arguments instead of maintaining separate trampoline slot metadata. (Eduard)
* Check the generic-trampoline arena argument invariant at link time and warn once on violations. (Eduard)
* Reject tracing attachments to struct_ops programs with arena context arguments whose indirect trampolines convert the pointers. (Sashiko)
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]
* Rebase onto current bpf-next to resolve conflicts.
v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]
* Fix documentation to only mention x86 for now. (Sashiko)
* Move arg bitmap from insn_aux_data to kfunc descriptor. (Eduard)
Kumar Kartikeya Dwivedi (5):
bpf: Rename 'early' BTF checking as a preparation phase
bpf: Split subprogram and kfunc collection
bpf: Collect kfuncs after resolving program resources
bpf: Reject tracing/freplace progs for struct_ops with arena args selftests/bpf: Test attach rejection for struct_ops arena programs
Tejun Heo (9):
bpf: Support __arena and __arena__nullable kfunc argument suffixes
bpf: Support __arena and __arena__nullable on struct_ops arguments bpf, x86: JIT __arena kfunc argument rebasing
bpf, x86: Convert struct_ops arena arguments in the trampoline selftests/bpf: Add kfunc __arena and __arena__nullable argument tests selftests/bpf: Add JIT-sequence tests for __arena kfunc arguments selftests/bpf: Add struct_ops __arena and __arena__nullable argument
tests
bpf, x86: Fix stack-passed arguments for indirect trampolines selftests/bpf: Test stack-passed struct_ops arena arguments
Documentation/bpf/kfuncs.rst | 39 +++ arch/x86/net/bpf_jit_comp.c | 122 ++++++++- include/linux/bpf.h | 15 ++ include/linux/bpf_verifier.h | 14 +- include/linux/filter.h | 1 + kernel/bpf/bpf_struct_ops.c | 56 +++-- kernel/bpf/btf.c | 28 ++- kernel/bpf/check_btf.c | 14 +- kernel/bpf/core.c | 5 + kernel/bpf/trampoline.c | 37 +++ kernel/bpf/verifier.c | 125 ++++++++-- .../bpf/prog_tests/test_struct_ops_arena.c | 128 ++++++++++ .../selftests/bpf/prog_tests/verifier.c | 6 + .../testing/selftests/bpf/progs/arena_kfunc.c | 234 ++++++++++++++++++ .../selftests/bpf/progs/arena_kfunc_jit.c | 98 ++++++++ .../selftests/bpf/progs/struct_ops_arena.c | 115 +++++++++ .../bpf/progs/struct_ops_arena_attach.c | 25 ++ .../bpf/progs/struct_ops_arena_fail.c | 20 ++ .../selftests/bpf/test_kmods/bpf_testmod.c | 82 ++++++ .../selftests/bpf/test_kmods/bpf_testmod.h | 6 + .../bpf/test_kmods/bpf_testmod_kfunc.h | 12 + 21 files changed, 1123 insertions(+), 59 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_arena.c create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc.c create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc_jit.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_attach.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_fail.c
base-commit: 51476f6a06ef55cecf785ae1622c638fa8cfb846
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 1/14 bpf: Rename 'early' BTF checking as a preparation phase
BTF processing is split around subprogram discovery. The first phase gets program BTF and imports func_info because a BTF-tagged exception callback may not be referenced by any instruction. Subprogram discovery needs this metadata to find it.
The later phase validates func_info and line_info against the complete subprogram table and applies CO-RE relocations. This split breaks a real dependency cycle rather than merely running the same checks early.
Rename bpf_check_btf_info_early() and check_btf_func_early() to preparation names that reflect this role. Add short call-site comments to make the two phases and their responsibilities clear.
No functional change is intended.
--- include/linux/bpf_verifier.h | 4 ++-- kernel/bpf/check_btf.c | 14 +++++++------- kernel/bpf/verifier.c | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-)
include/linux/bpf_verifier.h +2 -2
@@ -1177,8 +1177,8 @@ static inline void bpf_trampoline_unpack_key(u64 key, u32 *obj_id, u32 *btf_id) *btf_id = key &0x7FFFFFFF ; } -int bpf_check_btf_info_early (struct bpf_verifier_env *env, -const union bpf_attr *attr,bpfptr_t uattr); +int bpf_prepare_btf_info (struct bpf_verifier_env *env, +const union bpf_attr *attr,bpfptr_t uattr);int bpf_check_btf_info (struct bpf_verifier_env *env,const union bpf_attr *attr,bpfptr_t uattr);
kernel/bpf/check_btf.c +7 -7
@@ -28,9 +28,9 @@ static int check_abnormal_return(struct bpf_verifier_env *env)#define MIN_BPF_FUNCINFO_SIZE 8#define MAX_FUNCINFO_REC_SIZE 252 -static int check_btf_func_early (struct bpf_verifier_env *env, -const union bpf_attr *attr, -bpfptr_t uattr) +static int prepare_btf_func (struct bpf_verifier_env *env, +const union bpf_attr *attr, +bpfptr_t uattr) {u32 krec_size =sizeof (struct bpf_func_info );const struct btf_type *type, *func_proto;
@@ -407,9 +407,9 @@ static int check_core_relo(struct bpf_verifier_env *env,return err; } -int bpf_check_btf_info_early (struct bpf_verifier_env *env, -const union bpf_attr *attr, -bpfptr_t uattr) +int bpf_prepare_btf_info (struct bpf_verifier_env *env, +const union bpf_attr *attr, +bpfptr_t uattr) {struct btf *btf;int err;
@@ -429,7 +429,7 @@ int bpf_check_btf_info_early(struct bpf_verifier_env *env, } env->prog->aux->btf = btf; - err =check_btf_func_early (env, attr, uattr); + err =prepare_btf_func (env, attr, uattr);if (err)return err;return 0 ;
kernel/bpf/verifier.c +3 -1
@@ -20325,7 +20325,8 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr,INIT_LIST_HEAD (&env->explored_states[i]);INIT_LIST_HEAD (&env->free_list); - ret =bpf_check_btf_info_early (env, attr, uattr); +/* Prepare BTF and func_info needed to discover all subprograms. */ + ret =bpf_prepare_btf_info (env, attr, uattr);if (ret <0 ) goto skip_full_check;
@@ -20337,6 +20338,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr,if (ret <0 ) goto skip_full_check; +/* Validate BTF against the complete subprogram layout and apply CO-RE. */ ret =bpf_check_btf_info (env, attr, uattr);if (ret <0 ) goto skip_full_check;
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 2/14 bpf: Split subprogram and kfunc collection
In reply to Kumar Kartikeya Dwivediadd_subprog_and_kfunc() combines two operations with different ordering requirements. Subprogram discovery must precede validation of func_info and line_info, while kfunc descriptors are only needed by the verifier after its initial program setup is complete.
Split the helper into add_subprogs() and add_kfuncs() so each operation can be placed according to its actual dependencies. Keep both calls adjacent and in their existing phase for now, and add short comments describing their roles.
No functional change is intended for valid programs.
--- kernel/bpf/verifier.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-)
kernel/bpf/verifier.c +32 -9
@@ -2842,7 +2842,7 @@ int bpf_add_kfunc_call(struct bpf_verifier_env *env, u32 func_id, u16 offset)return 0 ; } -static int add_subprog_and_kfunc (struct bpf_verifier_env *env) +static int add_subprogs (struct bpf_verifier_env *env) {struct bpf_subprog_info *subprog = env->subprog_info;int i, ret, insn_cnt = env->prog->len, ex_cb_insn;
@@ -2854,8 +2854,7 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return ret;for (i =0 ; i < insn_cnt; i++, insn++) { -if (!bpf_pseudo_func (insn) && !bpf_pseudo_call (insn) && - !bpf_pseudo_kfunc_call (insn)) +if (!bpf_pseudo_func (insn) && !bpf_pseudo_call (insn))continue ;if (!env->bpf_capable) {
@@ -2863,11 +2862,7 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return -EPERM ; } -if (bpf_pseudo_func (insn) ||bpf_pseudo_call (insn)) - ret =add_subprog (env, i + insn->imm +1 ); -else - ret =bpf_add_kfunc_call (env, insn->imm, insn->off); - + ret =add_subprog (env, i + insn->imm +1 );if (ret <0 )return ret; }
@@ -2905,6 +2900,28 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return 0 ; } +static int add_kfuncs (struct bpf_verifier_env *env) +{ +struct bpf_insn *insn = env->prog->insnsi; +int i, ret, insn_cnt = env->prog->len; + +for (i =0 ; i < insn_cnt; i++, insn++) { +if (!bpf_pseudo_kfunc_call (insn)) +continue ; + +if (!env->bpf_capable) { +verbose (env,"loading/calling other bpf or kernel functions are allowed for CAP_BPF and CAP_SYS_ADMIN\n" ); +return -EPERM ; + } + + ret =bpf_add_kfunc_call (env, insn->imm, insn->off); +if (ret <0 ) +return ret; + } + +return 0 ; +} +static int check_subprogs (struct bpf_verifier_env *env) {int i, subprog_start, subprog_end, off, cur_subprog =0 ;
@@ -20330,7 +20347,13 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr,if (ret <0 ) goto skip_full_check; - ret =add_subprog_and_kfunc (env); +/* Discover all subprograms before validating their layout and BTF. */ + ret =add_subprogs (env); +if (ret <0 ) + goto skip_full_check; + +/* Collect the kfunc descriptors used during verification. */ + ret =add_kfuncs (env);if (ret <0 ) goto skip_full_check;
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v5 02/14] bpf: Split subprogram and kfunc collection
This isn't a bug, but now that the CAP_BPF check runs in two separate functions, would it help to say "bpf function calls" in add_subprogs() and "kernel function calls" in add_kfuncs() so the…
Quoted 36 lines
kernel/bpf/verifier.c +3
-8@@ -2842,7 +2842,7 @@ int bpf_add_kfunc_call(struct bpf_verifier_env *env, u32 func_id, u16 offset)return 0 ; } -static int add_subprog_and_kfunc (struct bpf_verifier_env *env) +static int add_subprogs (struct bpf_verifier_env *env) {struct bpf_subprog_info *subprog = env->subprog_info;int i, ret, insn_cnt = env->prog->len, ex_cb_insn;@@ -2854,8 +2854,7 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return ret;for (i =0 ; i < insn_cnt; i++, insn++) { -if (!bpf_pseudo_func (insn) && !bpf_pseudo_call (insn) && - !bpf_pseudo_kfunc_call (insn)) +if (!bpf_pseudo_func (insn) && !bpf_pseudo_call (insn))continue ;if (!env->bpf_capable) {@@ -2863,11 +2862,7 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return -EPERM ; } -if (bpf_pseudo_func (insn) ||bpf_pseudo_call (insn)) - ret =add_subprog (env, i + insn->imm +1 ); -else - ret =bpf_add_kfunc_call (env, insn->imm, insn->off); - + ret =add_subprog (env, i + insn->imm +1 );if (ret <0 )return ret; }
[ ... ]
Quoted 15 lines
kernel/bpf/verifier.c +11
-0@@ -2905,6 +2900,28 @@ static int add_subprog_and_kfunc(struct bpf_verifier_env *env)return 0 ; } +static int add_kfuncs (struct bpf_verifier_env *env) +{ +struct bpf_insn *insn = env->prog->insnsi; +int i, ret, insn_cnt = env->prog->len; + +for (i =0 ; i < insn_cnt; i++, insn++) { +if (!bpf_pseudo_kfunc_call (insn)) +continue ; + +if (!env->bpf_capable) { +verbose (env,"loading/calling other bpf or kernel functions are allowed for CAP_BPF and CAP_SYS_ADMIN\n" );
kernel/bpf/verifier.c static int add_subprog_and_kfunc(struct bpf_verifier_env *env) · line 2923
Quoted 10 lines
kernel/bpf/verifier.c +10
-0+return -EPERM ; + } + + ret =bpf_add_kfunc_call (env, insn->imm, insn->off); +if (ret <0 ) +return ret; + } + +return 0 ; +}
This isn't a bug, but now that the CAP_BPF check runs in two separate functions, would it help to say "bpf function calls" in add_subprogs() and "kernel function calls" in add_kfuncs() so the rejection reason is unambiguous?
The message "loading/calling other bpf or kernel functions are allowed for CAP_BPF and CAP_SYS_ADMIN" appears verbatim in both add_subprogs() and add_kfuncs(). Before the split there was a single site covering both cases; with two independent passes the identical string no longer tells the loader which kind of call was rejected.
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/31231521120
Kumar Kartikeya Dwivedi
maintainerPATCH v5 3/14 bpf: Collect kfuncs after resolving program resources
In reply to Kumar Kartikeya DwivediThe kfunc descriptors include argument prototypes generated while calls are collected. Some argument classifications need program auxiliary state derived from referenced maps, such as the arena associated with the program.
This avoids a footgun in get_kfunc_arg_type() checks where we do validation on whether program has prog->aux->arena and it hasn't been resolved yet.
check_and_resolve_insns() records used maps and populates that state. It must remain after bpf_check_btf_info(), which applies kernel-side CO-RE relocations, so that instruction validation and the program tag observe the relocated instruction stream.
Move only add_kfuncs() after instruction and resource resolution. Subprogram discovery and validation remain before the full BTF phase because that phase needs the complete subprogram layout. Add a short comment describing the resource resolution phase at the call site.
--- kernel/bpf/verifier.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
kernel/bpf/verifier.c +6 -5
@@ -20352,11 +20352,6 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr,if (ret <0 ) goto skip_full_check; -/* Collect the kfunc descriptors used during verification. */ - ret =add_kfuncs (env); -if (ret <0 ) - goto skip_full_check; - ret =check_subprogs (env);if (ret <0 ) goto skip_full_check;
@@ -20366,10 +20361,16 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr,if (ret <0 ) goto skip_full_check; +/* Validate instructions and resolve the program's referenced resources. */ ret =check_and_resolve_insns (env);if (ret <0 ) goto skip_full_check; +/* Build kfunc prototypes after resolving program resources. */ + ret =add_kfuncs (env); +if (ret <0 ) + goto skip_full_check; +if (bpf_prog_is_offloaded (env->prog->aux)) { ret =bpf_prog_offload_verifier_prep (env->prog);if (ret)
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 4/14 bpf: Support __arena and __arena__nullable kfunc argument suffixes
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Passing an arena pointer to a kfunc takes two steps today. There is no arena pointer argument type, so the pointer crosses the boundary as a bare scalar, and the kfunc then offsets it by the arena base and casts it before it can touch the memory. Every such kfunc open-codes the same translation.
Add the __arena and __arena__nullable argument suffixes to make this more convenient. The kfunc declares the parameter by its real pointer type and dereferences it directly, with the JIT rebasing the value at the call site, rN = kern_vm_start + (u32)rN. No bounds check is needed: the u32 offset stays within the guard-padded arena kernel mapping, and a fault on an unpopulated page recovers through the per-arena scratch page. A suffixed argument accepts a PTR_TO_ARENA or scalar register, matching global subprog arena arguments.
__arena rebases unconditionally, so the kfunc never sees NULL and a value with zero in the low 32 bits arrives as the arena base. __arena__nullable preserves NULL for optional arguments by skipping the rebase when the truncated value, arena offset 0, is zero. Keeping the plain form NULL-free saves the NULL test on every call.
The double separator makes the annotations composable:__arena__nullable also ends in __nullable and naturally follows the common nullable argument path. Plain __arena follows that path too for verifier type checking because both forms accept a constant zero; the function-model flag still determines whether the JIT preserves NULL or rebases it to the arena base.
This patch adds the verifier side: the suffixes are recognized in check_kfunc_args() and distilled into argument flags in the function model stored in the kfunc descriptor. JITs retrieve the model while emitting the call, avoiding per-call state in insn_aux_data.
JITs declare support with bpf_jit_supports_arena_args() and verification fails with -ENOTSUPP elsewhere.
--- Documentation/bpf/kfuncs.rst | 29 +++++++++++++++++++++++ include/linux/bpf.h | 6 +++++ include/linux/filter.h | 1 + kernel/bpf/btf.c | 18 +++++++++++++- kernel/bpf/core.c | 5 ++++ kernel/bpf/verifier.c | 46 ++++++++++++++++++++++++++++++++---- 6 files changed, 100 insertions(+), 5 deletions(-)
Documentation/bpf/kfuncs.rst +29 -0
@@ -278,6 +278,33 @@ An example is given below:: ... } +2.3.8 __arena and __arena__nullable Annotations +----------------------------------------------- + +Both annotations indicate that the pointer argument points into the +calling program's arena. The JIT rebases the value at the call site so +the kfunc receives a directly dereferenceable kernel address, subject to +the access rules described in :ref:`BPF_kfunc_arena_access` (at most +``GUARD_SZ / 2``, 32 KiB, past the pointer in a single unchecked access). + +With ``__arena`` the rebase is unconditional and the argument is never +NULL: a value whose lower 32 bits are zero arrives as the arena base +address (arena offset 0). The kfunc must not check the argument for NULL. +With ``__arena__nullable`` such a value arrives as NULL instead and the +kfunc must check before dereferencing. + +An example is given below:: + + __bpf_kfunc int bpf_process_item(struct item *item__arena) + { + ... + } + +Calling such a kfunc requires the program to use an arena map and a JIT with +arena argument support (currently x86-64); verification fails otherwise. The +program can pass any value without compromising the kernel. A value that does +not point into the arena is a program bug. + .. _BPF_kfunc_nodef: 2.4 Using an existing kernel function
@@ -522,6 +549,8 @@ In order to accommodate such requirements, the verifier will enforce strict PTR_TO_BTF_ID type matching if two types have the exact same name, with one being suffixed with ``___init``. +.. _BPF_kfunc_arena_access: + 2.8 Accessing arena memory through kfunc arguments --------------------------------------------------
include/linux/bpf.h +6 -0
@@ -1195,6 +1195,12 @@ struct bpf_prog_offload {/* The argument is signed. */ #define BTF_FMODEL_SIGNED_ARG BIT(1) +/* The argument is an arena pointer. */ +#define BTF_FMODEL_ARENA_ARG BIT(2) + +/* The argument is nullable. */ +#define BTF_FMODEL_NULLABLE_ARG BIT(3) +struct btf_func_model {u8 ret_size;u8 ret_flags;
include/linux/filter.h +1 -0
@@ -1214,6 +1214,7 @@ bool bpf_jit_supports_subprog_tailcalls(void);bool bpf_jit_supports_percpu_insn (void );bool bpf_jit_supports_kfunc_call (void );bool bpf_jit_supports_stack_args (void ); +bool bpf_jit_supports_arena_args (void );bool bpf_jit_supports_far_kfunc_call (void );bool bpf_jit_supports_exceptions (void );bool bpf_jit_supports_ptr_xchg (void );
kernel/bpf/btf.c +17 -1
@@ -7539,6 +7539,22 @@ static u8 __get_type_fmodel_flags(const struct btf_type *t)return flags; } +static u8 __get_arg_fmodel_flags (const struct btf *btf, +const struct btf_param *arg, +const struct btf_type *t) +{ +u8 flags =__get_type_fmodel_flags (t); + +if (btf_param_match_suffix (btf, arg,"__arena__nullable" )) + flags |=BTF_FMODEL_ARENA_ARG |BTF_FMODEL_NULLABLE_ARG ; +else if (btf_param_match_suffix (btf, arg,"__arena" )) + flags |=BTF_FMODEL_ARENA_ARG ; +else if (btf_param_match_suffix (btf, arg,"__nullable" )) + flags |=BTF_FMODEL_NULLABLE_ARG ; + +return flags; +} + int btf_distill_func_proto(struct bpf_verifier_log *log, struct btf *btf, const struct btf_type *func,
@@ -7604,7 +7620,7 @@ int btf_distill_func_proto(struct bpf_verifier_log *log,return -EINVAL ; } m->arg_size[i] = ret; - m->arg_flags[i] =__get_type_fmodel_flags (t); + m->arg_flags[i] =__get_arg_fmodel_flags (btf, &args[i], t); } m->nr_args = nargs;return 0 ;
kernel/bpf/core.c +5 -0
@@ -3308,6 +3308,11 @@ bool __weak bpf_jit_supports_stack_args(void)return false; } +bool __weak bpf_jit_supports_arena_args (void ) +{ +return false; +} +bool __weak bpf_jit_supports_far_kfunc_call (void ) {return false;
kernel/bpf/verifier.c +42 -4
94 lines not on this page · raw message
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 5/14 bpf: Support __arena and __arena__nullable on struct_ops arguments
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
A struct_ops callback cannot receive an arena pointer directly, so passing one takes two steps. The pointer arrives as a bare u64 that the callback casts, and because the two sides address the arena through different bases it also has to be rebased by hand on the way in.
Add the __arena and __arena__nullable stub argument suffixes to make this convenient. The callback declares the parameter as an arena pointer, receives it as a PTR_TO_ARENA register, and dereferences it directly, while the kernel caller just passes the natural kernel arena address (kaddr). The trampoline converts the value while saving the arguments into the BPF ctx, ctx[slot] = (u32)(kaddr - kern_vm_start), so the program never sees a kernel address and nothing rewrites the ctx after the fact. The converted value keeps the upper 32 bits clear as the JITs require of arena pointer registers and behaves like any cast_kern'ed arena pointer, so cast_user recovers the full user-visible address.
__arena converts unconditionally and the kernel caller must not pass NULL. __arena__nullable preserves NULL, tested on the full 64-bit kernel pointer, and surfaces to the verifier as PTR_TO_ARENA (but not as a PTR_TO_ARENA | PTR_MAYBE_NULL). The reason is that PTR_TO_ARENA in the program's type state already encompasses NULL-ness, so it is not meaningful to force a NULL check for the program.
The composite suffix intentionally ends in __nullable. Classify __arena__nullable before the generic suffix so scalar arena pointees do not take the generic nullable BTF pointer path.
This patch adds the generic side. prepare_arg_info() records arena and nullable argument flags in the struct_ops function model, and bpf_tramp_arena_base() returns the arena base for a single-program struct_ops indirect trampoline. Only that trampoline converts: its program's arena is fixed at generation time. Generic trampolines can mix programs with different arenas and reject arena context arguments defensively, which is unreachable today as only struct_ops programs carry them. Architectures that do not implement the conversion are gated out at verification time with bpf_jit_supports_arena_args().
--- Documentation/bpf/kfuncs.rst | 10 +++++++ include/linux/bpf.h | 9 ++++++ include/linux/bpf_verifier.h | 10 +++++++ kernel/bpf/bpf_struct_ops.c | 56 +++++++++++++++++++++++++++--------- kernel/bpf/btf.c | 10 +++++-- kernel/bpf/trampoline.c | 37 ++++++++++++++++++++++++ kernel/bpf/verifier.c | 23 +++++++++++---- 7 files changed, 133 insertions(+), 22 deletions(-)
Documentation/bpf/kfuncs.rst +10 -0
@@ -305,6 +305,16 @@ arena argument support (currently x86-64); verification fails otherwise. The program can pass any value without compromising the kernel. A value that does not point into the arena is a program bug. +The suffixes have the same meaning on the arguments of struct_ops stub +functions, with the conversion running in the opposite direction. The +kernel caller passes the kernel arena address and the trampoline converts +it while saving the arguments, so the callback receives an arena pointer +it can dereference directly. With ``__arena`` the kernel caller must not +pass NULL. With ``__arena__nullable`` a NULL kernel pointer arrives as NULL. +However, there is no obligation to prove to the verifier that such a pointer is +non-NULL before use, in-line with existing semantics of arena pointers used in +a program (or obtained from any other source). + .. _BPF_kfunc_nodef: 2.4 Using an existing kernel function
include/linux/bpf.h +9 -0
@@ -1274,6 +1274,15 @@ struct bpf_tramp_nodes {int nr_nodes; }; +/* +* The arena base against which a struct_ops trampoline converts the +* arguments marked with BTF_FMODEL_ARENA_ARG while saving them into the BPF +* ctx, ctx[arg] = (u32)(kaddr - kern_vm_start). Zero when the trampoline +* converts nothing. +*/ +u64 bpf_tramp_arena_base (const struct btf_func_model *m, +struct bpf_tramp_nodes *tnodes,u32 flags); +struct bpf_tramp_run_ctx ;/* Different use cases for BPF trampoline:
include/linux/bpf_verifier.h +10 -0
@@ -1302,6 +1302,16 @@ static inline u32 type_flag(u32 type)return type & ~BPF_BASE_TYPE_MASK ; } +static inline bool bpf_prog_has_arena_ctx_arg (const struct bpf_prog *prog) +{ +int i; + +for (i =0 ; i < prog->aux->ctx_arg_info_size; i++) +if (base_type (prog->aux->ctx_arg_info[i].reg_type) ==PTR_TO_ARENA ) +return true; +return false; +} +static inline enum bpf_prog_type resolve_prog_type (const struct bpf_prog *prog) { return (prog->type == BPF_PROG_TYPE_EXT && prog->aux->saved_dst_prog_type) ?
kernel/bpf/bpf_struct_ops.c +42 -14
105 lines not on this page · raw message
kernel/bpf/btf.c +7 -3
@@ -6963,15 +6963,19 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,return false; } -/* check for PTR_TO_RDONLY_BUF_OR_NULL or PTR_TO_RDWR_BUF_OR_NULL */ +/* +* Check for PTR_TO_RDONLY_BUF_OR_NULL, PTR_TO_RDWR_BUF_OR_NULL or +* PTR_TO_ARENA (both nullable and non-nullable cases). +*/ for (i =0 ; i < prog->aux->ctx_arg_info_size; i++) {const struct bpf_ctx_arg_aux *ctx_arg_info = &prog->aux->ctx_arg_info[i];u32 type, flag; type =base_type (ctx_arg_info->reg_type); flag =type_flag (ctx_arg_info->reg_type); -if (ctx_arg_info->offset == off && type ==PTR_TO_BUF && - (flag &PTR_MAYBE_NULL )) { +if (ctx_arg_info->offset == off && + (type ==PTR_TO_ARENA || + (type ==PTR_TO_BUF && (flag &PTR_MAYBE_NULL )))) { info->reg_type = ctx_arg_info->reg_type;return true; }
kernel/bpf/trampoline.c +37 -0
@@ -529,6 +529,36 @@ bpf_trampoline_get_progs(const struct bpf_trampoline *tr, int *total, bool *ip_areturn tnodes; } +/* +* The arena base against which save_args() converts the arguments marked +* with BTF_FMODEL_ARENA_ARG. Only the struct_ops indirect trampoline +* converts: it dispatches to a single prog whose arena is known at +* generation time. Return 0 when there is nothing to convert. +*/ +u64 bpf_tramp_arena_base (const struct btf_func_model *m, +struct bpf_tramp_nodes *tnodes,u32 flags) +{ +const struct bpf_prog *prog; +int i; + +if (!(flags &BPF_TRAMP_F_INDIRECT ) || + tnodes[BPF_TRAMP_FENTRY ].nr_nodes !=1 ) +return 0 ; + +for (i =0 ; i < m->nr_args; i++) +if (m->arg_flags[i] &BTF_FMODEL_ARENA_ARG ) +break ; +if (i == m->nr_args) +return 0 ; + +/* Verification rejects an arena argument without an arena. */ + prog = tnodes[BPF_TRAMP_FENTRY ].nodes[0 ]->link->prog; +if (WARN_ON_ONCE (!prog->aux->arena)) +return 0 ; + +return bpf_arena_get_kern_vm_start (prog->aux->arena); +} +static void bpf_tramp_image_free (struct bpf_tramp_image *im) {bpf_image_ksym_del (&im->ksym);
@@ -920,6 +950,13 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_node *node,int cnt =0 , i; kind =bpf_attach_type_to_tramp (node->link->prog); +/* +* Arena ctx args are converted only by struct_ops indirect +* trampolines. They must never be attached to a generic trampoline. +*/ +if (WARN_ON_ONCE (bpf_prog_has_arena_ctx_arg (node->link->prog))) +return -ENOTSUPP ; +if (tr->extension_prog)/* cannot attach fentry/fexit if extension prog is attached. * cannot overwrite extension prog either.
kernel/bpf/verifier.c +18 -5
@@ -18875,6 +18875,7 @@ static int check_struct_ops_btf_id(struct bpf_verifier_env *env) {const struct btf_type *t, *func_proto;const struct bpf_struct_ops_desc *st_ops_desc; +const struct bpf_struct_ops_arg_info *arg_info;const struct bpf_struct_ops *st_ops;const struct btf_member *member;struct bpf_prog *prog = env->prog;
@@ -18953,10 +18954,23 @@ static int check_struct_ops_btf_id(struct bpf_verifier_env *env)return -EACCES ; } -for (i =0 ; i < st_ops_desc->arg_info[member_idx].cnt; i++) { -if (st_ops_desc->arg_info[member_idx].info[i].refcounted) { + arg_info = &st_ops_desc->arg_info[member_idx]; +for (i =0 ; i < arg_info->cnt; i++) { +const struct bpf_ctx_arg_aux *info = &arg_info->info[i]; + +if (info->refcounted) has_refcounted_arg = true; -break ; +if (base_type (info->reg_type) ==PTR_TO_ARENA ) { +if (!bpf_jit_supports_arena_args ()) { +verbose (env,"JIT does not support arena arguments\n" ); +return -ENOTSUPP ; + } +if (!prog->aux->arena) { +verbose (env, +"arena argument of %s requires a program with an associated arena\n" , + mname); +return -EINVAL ; + } } }
@@ -18977,8 +18991,7 @@ static int check_struct_ops_btf_id(struct bpf_verifier_env *env) prog->aux->attach_func_name = mname; env->ops = st_ops->verifier_ops; -return bpf_prog_ctx_arg_info_init (prog, st_ops_desc->arg_info[member_idx].info, - st_ops_desc->arg_info[member_idx].cnt); +return bpf_prog_ctx_arg_info_init (prog, arg_info->info, arg_info->cnt); }#define SECURITY_PREFIX "security_"
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v5 05/14] bpf: Support __arena and __arena__nullable on struct_ops arguments
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Attaching an extension (freplace) or tracing (FENTRY/FEXIT) program to a struct_ops program with…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Attaching an extension (freplace) or tracing (FENTRY/FEXIT) program to a struct_ops program with arena arguments bypasses arena context argument verification, leading to type confusion and potential privilege escalation. --
--- Patch [5]: [PATCH bpf-next v5 05/14] bpf: Support __arena and __arena__nullable on struct_ops arguments --- commit b8ab49b96186f2dfd00ae0e67ee1912d4b9e3fac
Author: Tejun Heo <[email protected]>
bpf: Support __arena and __arena__nullable on struct_ops arguments
This commit adds support for __arena and __arena__nullable suffixes for arguments in struct_ops stub functions. It allows callbacks to receive arena pointers directly, with the trampoline handling the conversion between the kernel address and the BPF arena pointer.
(Note: The format of this report is altered to use a free-form summary rather than inline diff quotes due to recitation restrictions.)
[Severity: High]
There appears to be an issue in how __bpf_trampoline_link_prog() checks for arena arguments when linking programs. The security check evaluates bpf_prog_has_arena_ctx_arg(node->link->prog), which checks the attaching program rather than the target program (tgt_prog).
Because the attaching extension or tracing program does not have its ctx_arg_info_size initialized (it is 0), this check is bypassed and the attachment is allowed.
Furthermore, during verification of the extension program in btf_ctx_access(), the verifier loops over ctx_arg_info_size. Since it is 0 for the attaching program, the loop is skipped. The verifier then incorrectly types the 32-bit offset argument as a trusted 64-bit kernel pointer (PTR_TO_BTF_ID) based on the original BTF signature.
At runtime, the struct_ops indirect trampoline converts the incoming kernel pointer into a 32-bit arena offset and invokes the extension program. Since the verifier sees this as a trusted kernel pointer, could this lead to a type confusion where a user-controlled 32-bit offset is dereferenced as a kernel pointer?
Should __bpf_trampoline_link_prog() check tgt_prog instead, and does the verifier need to inherit or check the ctx_arg_info of the target program for extension programs?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Re: [PATCH bpf-next v5 05/14] bpf: Support __arena and __arena__nullable on struct_ops arguments
In reply to Kumar Kartikeya DwivediQuoted 39 lines · Kumar Kartikeya Dwivedi
From: Tejun Heo <[email protected]>
A
struct_opscallback cannot receive an arena pointer directly, so passing one takes two steps. The pointer arrives as a bare u64 that the callback casts, and because the two sides address the arena through different bases it also has to be rebased by hand on the way in.Add the
__arenaand__arena__nullablestub argument suffixes to make this convenient. The callback declares the parameter as an arena pointer, receives it as aPTR_TO_ARENAregister, and dereferences it directly, while the kernel caller just passes the natural kernel arena address (kaddr). The trampoline converts the value while saving the arguments into the BPF ctx, ctx[slot] = (u32)(kaddr -kern_vm_start), so the program never sees a kernel address and nothing rewrites the ctx after the fact. The converted value keeps the upper 32 bits clear as the JITs require of arena pointer registers and behaves like any cast_kern'ed arena pointer, socast_userrecovers the full user-visible address.
__arenaconverts unconditionally and the kernel caller must not pass NULL.__arena__nullablepreserves NULL, tested on the full 64-bit kernel pointer, and surfaces to the verifier asPTR_TO_ARENA(but not as aPTR_TO_ARENA|PTR_MAYBE_NULL). The reason is thatPTR_TO_ARENAin the program's type state already encompasses NULL-ness, so it is not meaningful to force a NULL check for the program.The composite suffix intentionally ends in
__nullable. Classify__arena__nullablebefore the generic suffix so scalar arena pointees do not take the generic nullable BTF pointer path.This patch adds the generic side.
prepare_arg_info()records arena and nullable argument flags in thestruct_opsfunction model, andbpf_tramp_arena_base()returns the arena base for a single-programstruct_opsindirect trampoline. Only that trampoline converts: its program's arena is fixed at generation time. Generic trampolines can mix programs with different arenas and reject arena context arguments defensively, which is unreachable today as onlystruct_opsprograms carry them. Architectures that do not implement the conversion are gated out at verification time withbpf_jit_supports_arena_args().
Quoted 4 lines
Signed-off-by Tejun Heo <[email protected]>Co-developed-by Kumar Kartikeya Dwivedi <[email protected]>Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>---
...
Kumar Kartikeya Dwivedi
maintainerPATCH v5 6/14 bpf, x86: JIT __arena kfunc argument rebasing
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Implement arena argument rebasing for kfunc calls on x86. R12 already holds kern_vm_start whenever the prog has an arena, so each tagged argument costs two instructions emitted right before the call:
movl %eN, %eN /* truncate, clear the upper 32 bits */
addq %r12, %rN
A nullable argument tests the truncated value and jumps over the add:
movl %eN, %eN
testl %eN, %eN
jz 1f
addq %r12, %rN
1:
addq carries a REX prefix for every argument register and is always three bytes, so the jz displacement is constant. The sequence is native code generated after constant blinding has run on the BPF instruction stream, so blinding never sees the rebase and needs no special handling.
bpf_jit_supports_arena_args() is not flipped yet; that happens when the struct_ops trampoline side is in place as well.
--- arch/x86/net/bpf_jit_comp.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/x86/net/bpf_jit_comp.c +50 -0
@@ -1678,6 +1678,50 @@ static int emit_spectre_bhb_barrier(u8 **pprog, u8 *ip,return 0 ; } +/* +* Rebase the __arena args of a kfunc call to arena kernel addresses, +* rN = kern_vm_start + (u32)rN, with R12 holding kern_vm_start. A nullable +* arg preserves NULL by skipping the add, tested on the truncated value as +* arena NULL is offset 0. Return the number of emitted bytes. +*/ +static int emit_kfunc_arena_args (struct bpf_prog *bpf_prog, +const struct bpf_insn *insn,u8 **pprog) +{ +const struct btf_func_model *fm; +u8 *prog = *pprog; +u8 *start = prog; +int i; + + fm =bpf_jit_find_kfunc_model (bpf_prog, insn); +if (!fm) +return -EINVAL ; + +for (i =0 ; i <min_t (int, fm->nr_args,MAX_BPF_FUNC_REG_ARGS ); i++) { +u8 flags = fm->arg_flags[i]; +u32 reg =BPF_REG_1 + i; + +if (!(flags &BTF_FMODEL_ARENA_ARG )) +continue ; +if (WARN_ON_ONCE (!bpf_prog->aux->arena)) +return -EINVAL ; + +/* mov eN, eN: truncate and clear the upper 32 bits */ +emit_mov_reg (&prog, false, reg, reg); +if (flags &BTF_FMODEL_NULLABLE_ARG ) { +/* test eN, eN; jz over the 3-byte add */ +maybe_emit_mod (&prog, reg, reg, false); +EMIT2 (0x85 ,add_2reg (0xC0 , reg, reg)); +EMIT2 (X86_JE ,3 ); + } +/* add rN, r12 */ +maybe_emit_mod (&prog, reg,X86_REG_R12 , true); +EMIT2 (0x01 ,add_2reg (0xC0 , reg,X86_REG_R12 )); + } + + *pprog = prog; +return prog - start; +} +static int do_jit (struct bpf_verifier_env *env,struct bpf_prog *bpf_prog,int *addrs,u8 *image,u8 *rw_image,int oldproglen,struct jit_context *ctx,bool jmp_padding) {
@@ -2588,6 +2632,12 @@ st: insn_off = insn->off; }if (!imm32)return -EINVAL ; +if (src_reg ==BPF_PSEUDO_KFUNC_CALL ) { + err =emit_kfunc_arena_args (bpf_prog, insn, &prog); +if (err <0 ) +return err; + ip += err; + }if (priv_frame_ptr) {push_r9 (&prog); ip +=2 ;
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 7/14 bpf, x86: Convert struct_ops arena arguments in the trampoline
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Implement the struct_ops arena argument conversion on x86. save_args() receives the arena base from bpf_tramp_arena_base() and consults the btf_func_model argument flags as it copies each native argument into the BPF ctx, routing a marked argument through RAX:
movl %esrc, %eax /* truncate and clear the upper 32 bits */
subl $base_lo, %eax
movq %rax, ctx_slot
A nullable argument tests the full 64-bit kernel pointer first:
movq %rsrc, %rax
testq %rax, %rax
jz 1f
subl $base_lo, %eax
1:
movq %rax, ctx_slot
The 32-bit subtraction is sufficient since (u32)(kaddr - base) == (u32)kaddr - (u32)base, and it clears the upper half as the JITs require of arena pointer registers. Stack-passed arguments already reload through RAX, so only the subtraction (and the NULL test) is inserted there.
Keep arena and nullable classification in btf_func_model. bpf_tramp_arena_base() returns a base only for a single-program struct_ops indirect trampoline; other trampolines pass zero and perform no conversion. The size probe reruns the same emission with the same model and nodes, so the image size matches by construction.
With both the kfunc and struct_ops directions implemented, flip bpf_jit_supports_arena_args() on for x86.
--- arch/x86/net/bpf_jit_comp.c | 57 +++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-)
arch/x86/net/bpf_jit_comp.c +51 -6
@@ -3048,8 +3048,35 @@ static int get_nr_used_regs(const struct btf_func_model *m)return nr_used_regs; } +/* +* Convert an arena kernel address into the arena pointer form on its way +* into the BPF ctx, rax = (u32)(src - kern_vm_start). A nullable arg +* preserves NULL, tested on the full 64-bit kernel pointer. The 32-bit +* subtraction both truncates and clears the upper half, so the stored +* value satisfies the JIT invariant for arena pointer registers. +*/ +static void emit_arena_arg_conv (u8 **pprog,u32 src_reg,bool nullable,u32 base_lo) +{ +u8 *prog = *pprog; + +if (nullable) { +if (src_reg !=BPF_REG_0 ) +emit_mov_reg (&prog, true,BPF_REG_0 , src_reg); +/* test rax, rax; jz over the 5-byte sub */ +EMIT3 (0x48 ,0x85 ,0xC0 ); +EMIT2 (X86_JE ,5 ); + }else if (src_reg !=BPF_REG_0 ) { +emit_mov_reg (&prog, false,BPF_REG_0 , src_reg); + } +/* sub eax, base_lo */ +EMIT1_off32 (0x2D , base_lo); + + *pprog = prog; +} +static void save_args (const struct btf_func_model *m,u8 **prog, -int stack_size,bool for_call_origin,u32 flags) +int stack_size,bool for_call_origin,u32 flags, +u64 arena_base) {int arg_regs, first_off =0 , nr_regs =0 , nr_stack_slots =0 ;bool use_jmp =bpf_trampoline_use_jmp (flags);
@@ -3061,6 +3088,9 @@ static void save_args(const struct btf_func_model *m, u8 **prog,* mov QWORD PTR [rbp-0x8],rsi */ for (i =0 ; i <min_t (int, m->nr_args,MAX_BPF_FUNC_ARGS ); i++) { +bool arena_arg = arena_base && (m->arg_flags[i] &BTF_FMODEL_ARENA_ARG ); +bool nullable = m->arg_flags[i] &BTF_FMODEL_NULLABLE_ARG ; + arg_regs = (m->arg_size[i] +7 ) /8 ;/* According to the research of Yonghong, struct members
@@ -3094,6 +3124,9 @@ static void save_args(const struct btf_func_model *m, u8 **prog,for (j =0 ; j < arg_regs; j++) {emit_ldx (prog,BPF_DW ,BPF_REG_0 ,BPF_REG_FP , nr_stack_slots *8 +16 + (!use_jmp) *8 ); +if (arena_arg) +emit_arena_arg_conv (prog,BPF_REG_0 , nullable, + (u32 )arena_base);emit_stx (prog,BPF_DW ,BPF_REG_FP ,BPF_REG_0 , -stack_size);
@@ -3114,9 +3147,13 @@ static void save_args(const struct btf_func_model *m, u8 **prog,/* copy the arguments from regs into stack */ for (j =0 ; j < arg_regs; j++) { -emit_stx (prog,BPF_DW ,BPF_REG_FP , - nr_regs ==5 ?X86_REG_R9 :BPF_REG_1 + nr_regs, - -stack_size); +u32 src = nr_regs ==5 ?X86_REG_R9 :BPF_REG_1 + nr_regs; + +if (arena_arg) { +emit_arena_arg_conv (prog, src, nullable, (u32 )arena_base); + src =BPF_REG_0 ; + } +emit_stx (prog,BPF_DW ,BPF_REG_FP , src, -stack_size); stack_size -=8 ; nr_regs++; }
@@ -3412,6 +3449,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imvoid *orig_call = func_addr;int cookie_off, cookie_cnt;u8 **branches =NULL ; +u64 arena_base;u64 func_meta;u8 *prog;bool save_ret;
@@ -3424,6 +3462,8 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imWARN_ON_ONCE ((flags &BPF_TRAMP_F_INDIRECT ) && (flags & ~(BPF_TRAMP_F_INDIRECT |BPF_TRAMP_F_RET_FENTRY_RET ))); + arena_base =bpf_tramp_arena_base (m, tnodes, flags); +for (i =0 ; i < m->nr_args; i++) nr_regs += (m->arg_size[i] +7 ) /8 -1 ;
@@ -3558,7 +3598,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imemit_store_stack_imm64 (&prog,BPF_REG_0 , -ip_off, (long )func_addr); } -save_args (m, &prog, regs_off, false, flags); +save_args (m, &prog, regs_off, false, flags, arena_base);if (flags &BPF_TRAMP_F_CALL_ORIG ) {/* arg1: mov rdi, im */
@@ -3600,7 +3640,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *rw_imif (flags &BPF_TRAMP_F_CALL_ORIG ) {restore_regs (m, &prog, regs_off); -save_args (m, &prog, arg_stack_off, true, flags); +save_args (m, &prog, arg_stack_off, true, flags,0 );if (flags &BPF_TRAMP_F_TAIL_CALL_CTX ) {/* Before calling the original function, load the
@@ -4101,6 +4141,11 @@ bool bpf_jit_supports_stack_args(void)return true; } +bool bpf_jit_supports_arena_args (void ) +{ +return true; +} +void *bpf_arch_text_copy (void *dst,void *src,size_t len) {if (text_poke_copy (dst, src, len) ==NULL )
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 8/14 selftests/bpf: Add kfunc __arena and __arena__nullable argument tests
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Add arena-argument kfuncs to bpf_testmod, which also exercises the argument rebasing on module kfuncs, and tests covering the accepted argument forms (arena pointer, low 32 bits as a scalar, full user address as a scalar), the exact rebase semantics via capture kfuncs returning the raw argument (zero low 32 bits arrive as the arena kernel base under __arena and as NULL under __arena__nullable), five arena arguments in one call, a mixed __arena plus __arena__nullable call exercising both bitmasks on one call site, a kernel-side dereference of an unpopulated page recovering through the scratch page, and the rejections (no arena in the program, incompatible register type).
The tests run on x86-64 and skip elsewhere, as programs with arena-tagged kfunc args fail verification where the JIT lacks support.
--- .../selftests/bpf/prog_tests/verifier.c | 3 + .../testing/selftests/bpf/progs/arena_kfunc.c | 234 ++++++++++++++++++ .../selftests/bpf/test_kmods/bpf_testmod.c | 44 ++++ .../bpf/test_kmods/bpf_testmod_kfunc.h | 9 + 4 files changed, 290 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc.c
tools/testing/selftests/bpf/prog_tests/verifier.c +3 -0
@@ -2,6 +2,7 @@#include <test_progs.h> +#include "arena_kfunc.skel.h" #include "cap_helpers.h" #include "verifier_align.skel.h" #include "verifier_and.skel.h"
@@ -161,6 +162,8 @@ static void run_tests_aux(const char *skel_name,#define RUN (skel) run_tests_aux(#skel, skel##__elf_bytes, NULL) +void test_arena_kfunc (void ) {RUN_TESTS (arena_kfunc); } +void test_verifier_align (void ) {RUN (verifier_align); }void test_verifier_and (void ) {RUN (verifier_and); }void test_verifier_arena (void ) {RUN (verifier_arena); }
tools/testing/selftests/bpf/progs/arena_kfunc.c new file +234 -0
234 lines not on this page · raw message
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +44 -0
56 lines not on this page · raw message
tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h +9 -0
@@ -98,6 +98,15 @@ void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) __ksym; void bpf_kfunc_call_test_ref(struct prog_test_ref_kfunc *p) __ksym; void bpf_kfunc_call_test_mem_len_pass1(void *mem, int len) __ksym; +__u64 bpf_kfunc_arena_arg_test(__u64 *val__arena) __ksym; +__u64 bpf_kfunc_arena_cap_test(__u64 *val__arena) __ksym; +__u64 bpf_kfunc_arena_cap_nullable_test(__u64 *val__arena__nullable) __ksym; +__u64 bpf_kfunc_arena_args5_test(__u64 *a__arena, __u64 *b__arena, + __u64 *c__arena, __u64 *d__arena, + __u64 *e__arena__nullable) __ksym; +__u64 bpf_kfunc_arena_stack_arg_test(__u64 a, __u64 b, __u64 c, __u64 d, __u64 e, + __u64 *f__arena) __ksym; +__u64 bpf_kfunc_arena_mixed_test(__u64 *a__arena, __u64 *b__arena__nullable) __ksym;int *bpf_kfunc_call_test_get_rdwr_mem (struct prog_test_ref_kfunc *p,const int rdwr_buf_size) __ksym;int *bpf_kfunc_call_test_get_rdonly_mem (struct prog_test_ref_kfunc *p,const int rdonly_buf_size) __ksym;int *bpf_kfunc_call_test_acq_rdonly_mem (struct prog_test_ref_kfunc *p,const int rdonly_buf_size) __ksym;
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 9/14 selftests/bpf: Add JIT-sequence tests for __arena kfunc arguments
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Pin the exact rebase sequences the JITs emit for __arena and __arena__nullable kfunc arguments with __jited assertions on x86-64: the unconditional truncate-and-add, the nullable test-and-skip variant, and all five argument registers in one call, which also covers the REX-prefixed encoding of r8 on x86. The capture kfuncs take the argument without dereferencing, so only the emitted code is under test. The tests skip without LLVM disassembler support.
--- .../selftests/bpf/prog_tests/verifier.c | 3 + .../selftests/bpf/progs/arena_kfunc_jit.c | 98 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc_jit.c
tools/testing/selftests/bpf/prog_tests/verifier.c +3 -0
@@ -3,6 +3,7 @@#include <test_progs.h> #include "arena_kfunc.skel.h" +#include "arena_kfunc_jit.skel.h" #include "cap_helpers.h" #include "verifier_align.skel.h" #include "verifier_and.skel.h"
@@ -164,6 +165,8 @@ static void run_tests_aux(const char *skel_name,void test_arena_kfunc (void ) {RUN_TESTS (arena_kfunc); } +void test_arena_kfunc_jit (void ) {RUN_TESTS (arena_kfunc_jit); } +void test_verifier_align (void ) {RUN (verifier_align); }void test_verifier_and (void ) {RUN (verifier_and); }void test_verifier_arena (void ) {RUN (verifier_arena); }
tools/testing/selftests/bpf/progs/arena_kfunc_jit.c new file +98 -0
98 lines not on this page · raw message
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 10/14 selftests/bpf: Add struct_ops __arena and __arena__nullable argument tests
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Add test_arena and test_arena_nullable members to bpf_testmod_ops3 with arena-tagged stub arguments and kfuncs that forward a caller-provided pointer to them. The kfuncs take arena-tagged arguments, so each round trip exercises both conversion directions end to end: the kfunc receives a kernel arena address and the trampoline converts it back to an arena pointer for the callback.
The non-nullable callback dereferences its argument with no NULL branch and captures the raw ctx value, which the trigger program compares against the arena offset of the passed object, pinning the exact (u32)(kaddr - kern_vm_start) conversion. The nullable callback verifies that only a true kernel NULL arrives as NULL. Failure coverage: a program with no arena is rejected when it loads. The tests run on x86-64 and skip elsewhere, as the programs fail verification where the JIT lacks arena argument support.
--- .../bpf/prog_tests/test_struct_ops_arena.c | 74 +++++++++++++++ .../selftests/bpf/progs/struct_ops_arena.c | 94 +++++++++++++++++++ .../bpf/progs/struct_ops_arena_fail.c | 20 ++++ .../selftests/bpf/test_kmods/bpf_testmod.c | 24 +++++ .../selftests/bpf/test_kmods/bpf_testmod.h | 3 + .../bpf/test_kmods/bpf_testmod_kfunc.h | 2 + 6 files changed, 217 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_arena.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena.c create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_fail.c
tools/testing/selftests/bpf/prog_tests/test_struct_ops_arena.c new file +74 -0
@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ +#include <test_progs.h> + +#include "struct_ops_arena.skel.h" +#include "struct_ops_arena_fail.skel.h" + +#if defined(__x86_64__) +/* +* Attach callbacks with __arena and __arena__nullable arguments and drive +* them through the bpf_testmod_ops3_call_test_arena*() kfuncs. +*/ +static void arena_arg (void ) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +struct struct_ops_arena *skel; +struct bpf_link *link =NULL ; +int err; + + skel =struct_ops_arena__open_and_load (); +if (!ASSERT_OK_PTR (skel,"struct_ops_arena__open_and_load" )) +return ; + + link =bpf_map__attach_struct_ops (skel->maps.testmod_arena); +if (!ASSERT_OK_PTR (link,"attach_struct_ops" )) + goto out; + + err =bpf_prog_test_run_opts (bpf_program__fd (skel->progs.trigger), + &topts); +ASSERT_OK (err,"test_run" ); +ASSERT_EQ (topts.retval,0 ,"trigger_retval" ); + +out: +bpf_link__destroy (link); +struct_ops_arena__destroy (skel); +} + +/* +* A program with no arena cannot attach to a member with an __arena +* argument. +*/ +static void arena_arg_fail (void ) +{ +struct struct_ops_arena_fail *skel; + + skel =struct_ops_arena_fail__open_and_load (); +if (ASSERT_ERR_PTR (skel,"struct_ops_arena_fail__open_and_load" )) +return ; + +struct_ops_arena_fail__destroy (skel); +} +#endif + +/* +* Serialized because it attaches the singleton bpf_testmod_ops3, which +* test_struct_ops_private_stack also attaches; registering it twice fails +* with -EEXIST. +*/ +void serial_test_struct_ops_arena (void ) +{ +/* +* Arena struct_ops arguments need JIT support, currently x86-64 only. +* Elsewhere verification fails with "JIT does not support arena +* arguments", so the programs cannot even load. +*/ +#if defined(__x86_64__) +if (test__start_subtest ("arena_arg" )) +arena_arg (); +if (test__start_subtest ("arena_arg_fail" )) +arena_arg_fail (); +#else +test__skip (); +#endif +}
tools/testing/selftests/bpf/progs/struct_ops_arena.c new file +94 -0
94 lines not on this page · raw message
tools/testing/selftests/bpf/progs/struct_ops_arena_fail.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ + +#include <vmlinux.h> +#include <bpf/bpf_helpers.h> +#include "../test_kmods/bpf_testmod.h" + +char _license[] SEC("license") = "GPL"; + +/* No arena in the program: attaching to test_arena must be rejected. */ +SEC("struct_ops/test_arena") +int test_arena_no_arena (unsigned long long *ctx) +{ +return 0 ; +} + +SEC(".struct_ops.link") +struct bpf_testmod_ops3 testmod_arena_fail = { + .test_arena = (void *)test_arena_no_arena, +};
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +24 -0
@@ -385,9 +385,21 @@ static int bpf_testmod_test_4(void)return 0 ; } +static int bpf_testmod_ops3__test_arena (u64 *ptr__arena) +{ +return 0 ; +} + +static int bpf_testmod_ops3__test_arena_nullable (u64 *ptr__arena__nullable) +{ +return 0 ; +} +static struct bpf_testmod_ops3 __bpf_testmod_ops3 = { .test_1 = bpf_testmod_test_3, .test_2 = bpf_testmod_test_4, + .test_arena = bpf_testmod_ops3__test_arena, + .test_arena_nullable = bpf_testmod_ops3__test_arena_nullable, };static void bpf_testmod_test_struct_ops3 (void )
@@ -406,6 +418,16 @@ __bpf_kfunc void bpf_testmod_ops3_call_test_2(void) st_ops3->test_2 (); } +__bpf_kfunc int bpf_testmod_ops3_call_test_arena(u64 *ptr__arena) +{ +return st_ops3->test_arena (ptr__arena); +} + +__bpf_kfunc int bpf_testmod_ops3_call_test_arena_nullable(u64 *ptr__arena__nullable) +{ +return st_ops3->test_arena_nullable (ptr__arena__nullable); +} +struct bpf_testmod_btf_type_tag_1 {int a; };
@@ -814,6 +836,8 @@ BTF_ID_FLAGS(func, bpf_testmod_ctx_create, KF_ACQUIRE | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_testmod_ctx_release, KF_RELEASE) BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_1) BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_2) +BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_arena) +BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_arena_nullable)BTF_ID_FLAGS (func, bpf_kfunc_get_default_trusted_ptr_test);BTF_ID_FLAGS (func, bpf_kfunc_put_default_trusted_ptr_test);BTF_KFUNCS_END (bpf_testmod_common_kfunc_ids)
tools/testing/selftests/bpf/test_kmods/bpf_testmod.h +3 -0
@@ -106,6 +106,9 @@ struct bpf_testmod_ops2 {struct bpf_testmod_ops3 {int (*test_1)(void );int (*test_2)(void ); +/* Used to test arena pointer arguments. */ +int (*test_arena)(u64 *ptr); +int (*test_arena_nullable)(u64 *ptr); };struct st_ops_args {
tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h +2 -0
@@ -120,6 +120,8 @@ u32 bpf_kfunc_call_test_static_unused_arg(u32 arg, u32 unused) __ksym;#endif void bpf_testmod_test_mod_kfunc(int i) __ksym; +int bpf_testmod_ops3_call_test_arena(__u64 *ptr__arena) __ksym; +int bpf_testmod_ops3_call_test_arena_nullable(__u64 *ptr__arena__nullable) __ksym; __u64 bpf_kfunc_call_test1(struct sock *sk, __u32 a, __u64 b, __u32 c, __u64 d) __ksym;
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v5 10/14] selftests/bpf: Add struct_ops __arena and __arena__nullable argument tests
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] Unsafe unconditional dereference of `st_ops3` and its callbacks in the newly added kfuncs, leading…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Unsafe unconditional dereference of st_ops3 and its callbacks in the newly added kfuncs, leading to a kernel panic. --
--- Patch [10]: [PATCH bpf-next v5 10/14] selftests/bpf: Add struct_ops __arena and __arena__nullable argument tests --- commit ca58e222e16e38d0927f0dd75956c9489242a175
Author: Tejun Heo <[email protected]>
selftests/bpf: Add struct_ops __arena and __arena__nullable argument tests
This patch adds test_arena and test_arena_nullable members to bpf_testmod_ops3 with arena-tagged arguments. It also introduces kfuncs that forward caller- provided pointers to them to test end-to-end conversions of arena pointers.
Quoted 4 lines
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +0
-0
[ ... ]
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c __bpf_kfunc void bpf_testmod_ops3_call_test_2(void) · line 423
Quoted 7 lines
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +3
-0@@ -406,6 +418,16 @@ __bpf_kfunc void bpf_testmod_ops3_call_test_2(void) st_ops3->test_2 (); } +__bpf_kfunc int bpf_testmod_ops3_call_test_arena(u64 *ptr__arena) +{ +return st_ops3->test_arena (ptr__arena);
[Severity: High]
Does this code risk a NULL pointer dereference if st_ops3 has not been set yet?
The global pointer st_ops3 is initialized to NULL and only set when a struct_ops map is explicitly registered. A BPF program could trigger a kernel panic by invoking this kfunc via BPF_PROG_RUN before the map is attached, or concurrently during teardown.
While this pattern is also used in the pre-existing bpf_testmod_ops3_call_test_1() kfunc, should st_ops3 be checked for NULL, potentially while holding st_ops_mutex, before dereferencing it here?
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c __bpf_kfunc void bpf_testmod_ops3_call_test_2(void) · line 428
Quoted 5 lines
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +5
-0+} + +__bpf_kfunc int bpf_testmod_ops3_call_test_arena_nullable(u64 *ptr__arena__nullable) +{ +return st_ops3->test_arena_nullable (ptr__arena__nullable);
[Severity: High]
Similarly, can this unconditionally dereference st_ops3 when it is NULL?
Quoted 1 line
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +1
-0+}
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Kumar Kartikeya Dwivedi
maintainerPATCH v5 11/14 bpf, x86: Fix stack-passed arguments for indirect trampolines
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
save_args() reads stack-passed arguments relative to rbp assuming two return addresses sit between the saved rbp and the arguments, which holds when the trampoline is entered through the fentry call from a traced function. An indirect trampoline is called through a function pointer, so only the caller's return address is on the stack and the arguments start at rbp + 16, not rbp + 24. Every stack-passed argument of a struct_ops callback with more than six argument slots is read one slot off.
This has gone unnoticed because no in-tree struct_ops member passes arguments on the stack. The jmp-entry form already accounts for having a single return address; treat BPF_TRAMP_F_INDIRECT the same way.
--- arch/x86/net/bpf_jit_comp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
arch/x86/net/bpf_jit_comp.c +8 -7
@@ -3080,6 +3080,7 @@ static void save_args(const struct btf_func_model *m, u8 **prog, {int arg_regs, first_off =0 , nr_regs =0 , nr_stack_slots =0 ;bool use_jmp =bpf_trampoline_use_jmp (flags); +int stack_args_off = (use_jmp || (flags &BPF_TRAMP_F_INDIRECT )) ?16 :24 ;int i, j;/* Store function arguments to stack.
@@ -3114,16 +3115,16 @@ static void save_args(const struct btf_func_model *m, u8 **prog,/* copy function arguments from origin stack frame * into current stack frame. * -* The starting address of the arguments on-stack -* is: -* rbp + 8(push rbp) + -* 8(return addr of origin call) + -* 8(return addr of the caller) -* which means: rbp + 24 +* The arguments on-stack start above the saved rbp +* and the return addresses: two return addresses +* (origin call and caller) when the trampoline is +* entered through the fentry call, so rbp + 24, and +* a single one when it is entered with a jmp or +* called indirectly, so rbp + 16. */ for (j =0 ; j < arg_regs; j++) {emit_ldx (prog,BPF_DW ,BPF_REG_0 ,BPF_REG_FP , - nr_stack_slots *8 +16 + (!use_jmp) *8 ); + nr_stack_slots *8 + stack_args_off);if (arena_arg)emit_arena_arg_conv (prog,BPF_REG_0 , nullable, (u32 )arena_base);
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v5 11/14] bpf, x86: Fix stack-passed arguments for indirect trampolines
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Incomplete fix: The off-by-one-slot stack argument read bug for BPF_TRAMP_F_INDIRECT trampolines was fixed for x86 but identical bugs remain in arm64, riscv, and loongarch JITs. --
--- Patch [11]: [PATCH bpf-next v5 11/14] bpf, x86: Fix stack-passed arguments for indirect trampolines --- commit b424d38504eb2136da7da04d1aa98780ba7432d8
Author: Tejun Heo <[email protected]>
bpf, x86: Fix stack-passed arguments for indirect trampolines
This commit fixes the stack offset calculation for stack-passed arguments in x86 indirect trampolines by accounting for the single return address on the stack.
Quoted 4 lines
arch/x86/net/bpf_jit_comp.c +0
-0
[ ... ]
arch/x86/net/bpf_jit_comp.c static void save_args(const struct btf_func_model *m, u8 **prog, · line 3083
Quoted 5 lines
arch/x86/net/bpf_jit_comp.c +1
-0@@ -3080,6 +3080,7 @@ static void save_args(const struct btf_func_model *m, u8 **prog, {int arg_regs, first_off =0 , nr_regs =0 , nr_stack_slots =0 ;bool use_jmp =bpf_trampoline_use_jmp (flags); +int stack_args_off = (use_jmp || (flags &BPF_TRAMP_F_INDIRECT )) ?16 :24 ;
[Severity: High]
This isn't a bug introduced by this patch, but does this same offset issue need to be fixed in the trampolines for other architectures as well?
For example, in arm64, save_args() hardcodes an offset of 32:
arch/arm64/net/bpf_jit_comp.c:save_args() {
...
soff = 32; /* on stack arguments start from FP + 32 */
...
}This assumes two 16-byte frames are pushed. Since BPF_TRAMP_F_INDIRECT only pushes one frame, reading from FP + 32 reads from the old SP + 16, skipping 16 bytes of arguments.
Similarly, riscv hardcodes a 16-byte offset relative to FP:
arch/riscv/net/bpf_jit_comp64.c:store_args() {
...
emit_ld(RV_REG_T1, 16 + (i - RV_MAX_REG_ARGS) * 8, RV_REG_FP, ctx);
...
}Since FP points directly to the old stack pointer for indirect trampolines, this skips the first 16 bytes of caller arguments.
Loongarch has the identical pattern:
arch/loongarch/net/bpf_jit.c:store_args() {
...
emit_insn(ctx, ldd, LOONGARCH_GPR_T1, LOONGARCH_GPR_FP,
16 + (i - LOONGARCH_MAX_REG_ARGS) * 8);
...
}If a struct_ops callback were to receive enough arguments to be passed on the stack, would these architectures also pass garbage to the BPF program due to reading past the actual start of the stack arguments?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Kumar Kartikeya Dwivedi
maintainerPATCH v5 12/14 selftests/bpf: Test stack-passed struct_ops arena arguments
In reply to Kumar Kartikeya DwivediFrom: Tejun Heo <[email protected]>
Add a test_arena_stack member with eight leading scalar arguments so the arena pointer is passed on the stack.
The callback validates the first and last scalar ctx slots before dereferencing the pointer in ctx[8]. This exercises the indirect trampoline stack layout and arena conversion together, and prevents a regression where stack arguments are read one slot late.
--- .../selftests/bpf/progs/struct_ops_arena.c | 21 +++++++++++++++++++ .../selftests/bpf/test_kmods/bpf_testmod.c | 14 +++++++++++++ .../selftests/bpf/test_kmods/bpf_testmod.h | 3 +++ .../bpf/test_kmods/bpf_testmod_kfunc.h | 1 + 4 files changed, 39 insertions(+)
tools/testing/selftests/bpf/progs/struct_ops_arena.c +21 -0
@@ -46,10 +46,24 @@ int test_arena_nullable_cb(unsigned long long *ctx)return 0 ; } +SEC("struct_ops/test_arena_stack") +int test_arena_stack_cb (unsigned long long *ctx) +{ + u64 __arena *ptr = (u64 __arena *)ctx[8]; + + arena_touch++; +/* pin the slot layout: the leading args fill ctx[0]..ctx[7] */ +if (ctx[0 ] !=1 || ctx[7 ] !=8 ) +return 0xbad ; + *ptr +=1 ; +return 0 ; +} + SEC(".struct_ops.link")struct bpf_testmod_ops3 testmod_arena = { .test_arena = (void *)test_arena_cb, .test_arena_nullable = (void *)test_arena_nullable_cb, + .test_arena_stack = (void *)test_arena_stack_cb, };SEC ("syscall" )
@@ -88,6 +102,13 @@ int trigger(void *ctx)if (ret !=0xbee )return 7 ; +/* the arena pointer is stack-passed into the trampoline here */ + ret =bpf_testmod_ops3_call_test_arena_stack ((u64 *)val); +if (ret) +return 8 ; +if (*val !=44 ) +return 9 ; + bpf_arena_free_pages(&arena, (void __arena *)val, 1);#endif return 0 ;
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +14 -0
@@ -395,11 +395,19 @@ static int bpf_testmod_ops3__test_arena_nullable(u64 *ptr__arena__nullable)return 0 ; } +static int bpf_testmod_ops3__test_arena_stack (u64 a,u64 b,u64 c,u64 d, +u64 e,u64 f,u64 g,u64 h, +u64 *ptr__arena) +{ +return 0 ; +} +static struct bpf_testmod_ops3 __bpf_testmod_ops3 = { .test_1 = bpf_testmod_test_3, .test_2 = bpf_testmod_test_4, .test_arena = bpf_testmod_ops3__test_arena, .test_arena_nullable = bpf_testmod_ops3__test_arena_nullable, + .test_arena_stack = bpf_testmod_ops3__test_arena_stack, };static void bpf_testmod_test_struct_ops3 (void )
@@ -428,6 +436,11 @@ __bpf_kfunc int bpf_testmod_ops3_call_test_arena_nullable(u64 *ptr__arena__nullareturn st_ops3->test_arena_nullable (ptr__arena__nullable); } +__bpf_kfunc int bpf_testmod_ops3_call_test_arena_stack(u64 *ptr__arena) +{ +return st_ops3->test_arena_stack (1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 , ptr__arena); +} +struct bpf_testmod_btf_type_tag_1 {int a; };
@@ -838,6 +851,7 @@ BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_1) BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_2) BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_arena) BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_arena_nullable) +BTF_ID_FLAGS(func, bpf_testmod_ops3_call_test_arena_stack)BTF_ID_FLAGS (func, bpf_kfunc_get_default_trusted_ptr_test);BTF_ID_FLAGS (func, bpf_kfunc_put_default_trusted_ptr_test);BTF_KFUNCS_END (bpf_testmod_common_kfunc_ids)
tools/testing/selftests/bpf/test_kmods/bpf_testmod.h +3 -0
@@ -109,6 +109,9 @@ struct bpf_testmod_ops3 {/* Used to test arena pointer arguments. */ int (*test_arena)(u64 *ptr);int (*test_arena_nullable)(u64 *ptr); +/* enough leading args to force @ptr onto the stack on x86 and arm64 */ +int (*test_arena_stack)(u64 a,u64 b,u64 c,u64 d,u64 e,u64 f, +u64 g,u64 h,u64 *ptr); };struct st_ops_args {
tools/testing/selftests/bpf/test_kmods/bpf_testmod_kfunc.h +1 -0
@@ -122,6 +122,7 @@ u32 bpf_kfunc_call_test_static_unused_arg(u32 arg, u32 unused) __ksym; void bpf_testmod_test_mod_kfunc(int i) __ksym; int bpf_testmod_ops3_call_test_arena(__u64 *ptr__arena) __ksym; int bpf_testmod_ops3_call_test_arena_nullable(__u64 *ptr__arena__nullable) __ksym; +int bpf_testmod_ops3_call_test_arena_stack(__u64 *ptr__arena) __ksym; __u64 bpf_kfunc_call_test1(struct sock *sk, __u32 a, __u64 b, __u32 c, __u64 d) __ksym;
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerPATCH v5 13/14 bpf: Reject tracing/freplace progs for struct_ops with arena args
In reply to Kumar Kartikeya DwivediReject tracing and freplace attachments to a target program with arena context arguments. The struct_ops indirect trampoline converts those arguments before entering the target, so a generic tracing trampoline would otherwise expose arena offsets using the target BTF pointer type.
--- kernel/bpf/verifier.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/bpf/verifier.c +10 -0
@@ -19258,6 +19258,16 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,bpf_log (log,"Subprog %s doesn't exist\n" , tname);return -EINVAL ; } +/* +* A struct_ops indirect trampoline converts arena arguments +* before invoking its program. A tracing or extension program +* attached to the main program would see the converted offset as a +* regular BTF pointer. +*/ +if (subprog ==0 &&bpf_prog_has_arena_ctx_arg (tgt_prog)) { +bpf_log (log,"Cannot attach to a target with arena context arguments\n" ); +return -EOPNOTSUPP ; + }if (aux->func && aux->func[subprog]->aux->exception_cb) { bpf_log(log, "%s programs cannot attach to exception callback\n",
Signature · 1 line
2.53.0-Meta
[email protected]
AI reviewRe: [PATCH bpf-next v5 13/14] bpf: Reject tracing/freplace progs for struct_ops with arena args
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [Critical] The patch restricts attaching extension or tracing programs to the main program (`subprog ==…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [Critical] The patch restricts attaching extension or tracing programs to the main program (subprog == 0) of a target with arena context arguments, but explicitly fails to restrict attachments to global subprograms (subprog > 0). This leaves a type confusion vulnerability open where a 32-bit user-controlled arena offset is treated as a trusted 64-bit kernel pointer.
- [High] A WARN_ON_ONCE check in the trampoline linking code incorrectly validates the attached tracing/extension program instead of the target program, rendering the safety check ineffective.
--
--- Patch [13]: [PATCH bpf-next v5 13/14] bpf: Reject tracing/freplace progs for struct_ops with arena args --- commit b54b0858382f938c9a42e0941274db3241ba575f
Author: Kumar Kartikeya Dwivedi <[email protected]>
bpf: Reject tracing/freplace progs for struct_ops with arena args
This commit restricts attaching tracing and extension programs to a target program with arena context arguments. The restriction is added because the struct_ops indirect trampoline converts these arguments, and a generic tracing trampoline would expose the converted offset as a regular BTF pointer.
Quoted 5 lines
kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 19267
Quoted 10 lines
kernel/bpf/verifier.c +7
-0@@ -19258,6 +19258,16 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,bpf_log (log,"Subprog %s doesn't exist\n" , tname);return -EINVAL ; } +/* +* A struct_ops indirect trampoline converts arena arguments +* before invoking its program. A tracing or extension program +* attached to the main program would see the converted offset as a +* regular BTF pointer. +*/ +if (subprog ==0 &&bpf_prog_has_arena_ctx_arg (tgt_prog)) {
[Severity: Critical]
Does this code leave a type confusion vulnerability open for global subprograms?
This check explicitly requires subprog == 0 and relies on ctx_arg_info from the main program, bypassing protection for attachments to global subprograms.
Can an attacker load a struct_ops program that passes its converted 32-bit arena offset to a global subprogram taking a struct bpf_arena * argument with the __arg_arena tag, and then attach an fentry tracing program to the global subprogram?
In btf_ctx_access(), this loop is skipped for fentry programs because their ctx_arg_info_size is 0:
kernel/bpf/btf.c:btf_ctx_access() {
...
for (i = 0; i < prog->aux->ctx_arg_info_size; i++) {
...
}Would this cause the verifier to fall through, ignore the __arg_arena tag, and incorrectly type the intercepted 32-bit offset as a 64-bit PTR_TO_BTF_ID | PTR_TRUSTED kernel pointer, leading to arbitrary out-of-bounds kernel memory read/write?
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 19273
Quoted 6 lines
kernel/bpf/verifier.c +3
-0+bpf_log (log,"Cannot attach to a target with arena context arguments\n" ); +return -EOPNOTSUPP ; + }if (aux->func && aux->func[subprog]->aux->exception_cb) { bpf_log(log, "%s programs cannot attach to exception callback\n",
[Severity: High]
Does the WARN_ON_ONCE check in the trampoline linking code incorrectly validate the attached tracing/extension program instead of the target program?
In __bpf_trampoline_link_prog():
kernel/bpf/trampoline.c:__bpf_trampoline_link_prog() {
...
if (WARN_ON_ONCE(bpf_prog_has_arena_ctx_arg(node->link->prog)))
return -ENOTSUPP;
...
}When an fentry or freplace program is linked via bpf_trampoline_link_prog(), __bpf_trampoline_link_prog() calls bpf_prog_has_arena_ctx_arg() with node->link->prog.
Since node->link->prog is the fentry/freplace program (which never has ctx_arg_info populated), doesn't this check always evaluate to false?
Should it have checked tgt_prog instead, so it doesn't fail to prevent generic trampolines from attaching to programs with arena arguments?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=13
Re: [PATCH bpf-next v5 13/14] bpf: Reject tracing/freplace progs for struct_ops with arena args
In reply to Kumar Kartikeya DwivediQuoted 7 lines · Kumar Kartikeya Dwivedi
Reject tracing and freplace attachments to a target program with arena context arguments. The
struct_opsindirect trampoline converts those arguments before entering the target, so a generic tracing trampoline would otherwise expose arena offsets using the target BTF pointer type.Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>---
It appears a similar check is needed for kfuncs with __arena args, let's add as a follow-up. (But we need figure out how to properly handle these args eventually).
...
Kumar Kartikeya Dwivedi
maintainerPATCH v5 14/14 selftests/bpf: Test attach rejection for struct_ops arena programs
In reply to Kumar Kartikeya DwivediExercise fentry, fexit, and freplace programs that target a struct_ops callback with an arena context argument. Verify each load is rejected with -EOPNOTSUPP and the arena-specific verifier diagnostic.
--- .../bpf/prog_tests/test_struct_ops_arena.c | 54 +++++++++++++++++++ .../bpf/progs/struct_ops_arena_attach.c | 25 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_attach.c
tools/testing/selftests/bpf/prog_tests/test_struct_ops_arena.c +54 -0
@@ -3,6 +3,7 @@#include <test_progs.h> #include "struct_ops_arena.skel.h" +#include "struct_ops_arena_attach.skel.h" #include "struct_ops_arena_fail.skel.h" #if defined(__x86_64__)
@@ -49,6 +50,57 @@ static void arena_arg_fail(void)struct_ops_arena_fail__destroy (skel); } + +static void arena_arg_attach_one (int target_fd,const char *prog_name) +{ +struct struct_ops_arena_attach *skel; +struct bpf_program *prog, *pos; +char log_buf[64 *1024 ]; +int err; + + skel =struct_ops_arena_attach__open (); +if (!ASSERT_OK_PTR (skel,"struct_ops_arena_attach__open" )) +return ; + + prog =bpf_object__find_program_by_name (skel->obj, prog_name); +if (!ASSERT_OK_PTR (prog, prog_name)) + goto out; + +bpf_object__for_each_program (pos, skel->obj) +bpf_program__set_autoload (pos, pos == prog); + + err =bpf_program__set_attach_target (prog, target_fd,"test_arena_cb" ); +if (!ASSERT_OK (err,"set_attach_target" )) + goto out; + + log_buf[0 ] ='\0' ; +bpf_program__set_log_buf (prog, log_buf,sizeof (log_buf)); + err =struct_ops_arena_attach__load (skel); + +ASSERT_EQ (err, -EOPNOTSUPP , prog_name); +ASSERT_HAS_SUBSTR (log_buf,"Cannot attach to a target with arena context arguments" , +"verifier_log" ); + +out: +struct_ops_arena_attach__destroy (skel); +} + +static void arena_arg_attach (void ) +{ +struct struct_ops_arena *skel; +int target_fd; + + skel =struct_ops_arena__open_and_load (); +if (!ASSERT_OK_PTR (skel,"struct_ops_arena__open_and_load" )) +return ; + + target_fd =bpf_program__fd (skel->progs.test_arena_cb); +arena_arg_attach_one (target_fd,"fentry_test_arena" ); +arena_arg_attach_one (target_fd,"fexit_test_arena" ); +arena_arg_attach_one (target_fd,"freplace_test_arena" ); + +struct_ops_arena__destroy (skel); +}#endif /*
@@ -68,6 +120,8 @@ void serial_test_struct_ops_arena(void)arena_arg ();if (test__start_subtest ("arena_arg_fail" ))arena_arg_fail (); +if (test__start_subtest ("arena_arg_attach" )) +arena_arg_attach ();#else test__skip ();#endif
tools/testing/selftests/bpf/progs/struct_ops_arena_attach.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +SEC("fentry") +int BPF_PROG (fentry_test_arena ,unsigned long long *st_ops_ctx) +{ +return 0 ; +} + +SEC("fexit") +int BPF_PROG (fexit_test_arena ,unsigned long long *st_ops_ctx,int ret) +{ +return 0 ; +} + +SEC("freplace") +int freplace_test_arena (unsigned long long *st_ops_ctx) +{ +return 0 ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.53.0-Meta
Re: [PATCH bpf-next v5 14/14] selftests/bpf: Test attach rejection for struct_ops arena programs
Quoted 6 lines · Kumar Kartikeya Dwivedi
Exercise fentry, fexit, and freplace programs that target a
struct_opscallback with an arena context argument. Verify each load is rejected with-EOPNOTSUPPand the arena-specific verifier diagnostic.Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>---
This series was applied to bpf/bpf-next.git (master) by Eduard Zingerman <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Eduard Zingerman <[email protected]>:
Quoted 8 lines · On Sat, 8 Aug 2026 02:39:20 +0200 you wrote:
This is a continuation of patches in [0], with mostly minor changes and reordering. The motivation is covered in that link. A major change is moving to two tags (
__arenaand__arena__nullable) and moving the changes to JIT to emit more optimized sequences.Please see commit logs for details.
[...]
Here is the summary with links:
- [bpf-next,v5,01/14] bpf: Rename 'early' BTF checking as a preparation phase
https://git.kernel.org/bpf/bpf-next/c/04962afb3cd6 - [bpf-next,v5,02/14] bpf: Split subprogram and kfunc collection https://git.kernel.org/bpf/bpf-next/c/41f36ffa3a87 - [bpf-next,v5,03/14] bpf: Collect kfuncs after resolving program resources https://git.kernel.org/bpf/bpf-next/c/d98b2d445fc5 - [bpf-next,v5,04/14] bpf: Support __arena and __arena__nullable kfunc argument suffixes https://git.kernel.org/bpf/bpf-next/c/252d36716326 - [bpf-next,v5,05/14] bpf: Support __arena and __arena__nullable on struct_ops arguments https://git.kernel.org/bpf/bpf-next/c/f6c33c4479a7 - [bpf-next,v5,06/14] bpf, x86: JIT __arena kfunc argument rebasing https://git.kernel.org/bpf/bpf-next/c/41b75522304c - [bpf-next,v5,07/14] bpf, x86: Convert struct_ops arena arguments in the trampoline https://git.kernel.org/bpf/bpf-next/c/5129e9be2111 - [bpf-next,v5,08/14] selftests/bpf: Add kfunc __arena and __arena__nullable argument tests https://git.kernel.org/bpf/bpf-next/c/0996e93691f1 - [bpf-next,v5,09/14] selftests/bpf: Add JIT-sequence tests for __arena kfunc arguments https://git.kernel.org/bpf/bpf-next/c/25818556edcf - [bpf-next,v5,10/14] selftests/bpf: Add struct_ops __arena and __arena__nullable argument tests https://git.kernel.org/bpf/bpf-next/c/ba0484197163 - [bpf-next,v5,11/14] bpf, x86: Fix stack-passed arguments for indirect trampolines https://git.kernel.org/bpf/bpf-next/c/596824de8c10 - [bpf-next,v5,12/14] selftests/bpf: Test stack-passed struct_ops arena arguments https://git.kernel.org/bpf/bpf-next/c/2d4de9a493a0 - [bpf-next,v5,13/14] bpf: Reject tracing/freplace progs for struct_ops with arena args https://git.kernel.org/bpf/bpf-next/c/fd6094ac877c - [bpf-next,v5,14/14] selftests/bpf: Test attach rejection for struct_ops arena programs https://git.kernel.org/bpf/bpf-next/c/4976cce08baa
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html