bpf: Refactor check_ctx_access()
PATCH 1/1 bpf: Refactor check_ctx_access()
Reduce the variable passing madness surrounding check_ctx_access(). Currently, check_mem_access() passes many pointers to local variables to check_ctx_access(). They are used to initialize "struct bpf_insn_access_aux info" in check_ctx_access() and then passed to is_valid_access(). Then, check_ctx_access() takes the data our from info and write them back the pointers to pass them back. This can be simpilified by moving info up to check_mem_access().
No functional change.
--- kernel/bpf/verifier.c | 56 ++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 36 deletions(-)
kernel/bpf/verifier.c +20 -36
@@ -6006,19 +6006,10 @@ static int check_packet_access(struct bpf_verifier_env *env, u32 regno, int off,/* check access to 'struct bpf_context' fields. Supports fixed offsets only */ static int check_ctx_access (struct bpf_verifier_env *env,int insn_idx,int off,int size, -enum bpf_access_type t,enum bpf_reg_type *reg_type, -struct btf **btf,u32 *btf_id,bool *is_retval,bool is_ldsx, -u32 *ref_obj_id) +enum bpf_access_type t,struct bpf_insn_access_aux *info) { -struct bpf_insn_access_aux info = { - .reg_type = *reg_type, - .log = &env->log, - .is_retval = false, - .is_ldsx = is_ldsx, - }; -if (env->ops->is_valid_access && - env->ops->is_valid_access (off, size, t, env->prog, &info)) { + env->ops->is_valid_access (off, size, t, env->prog, info)) {/* A non zero info.ctx_field_size indicates that this field is a * candidate for later verifier transformation to load the whole * field and then apply a mask when accessed with a narrower
@@ -6026,22 +6017,15 @@ static int check_ctx_access(struct bpf_verifier_env *env, int insn_idx, int off,* will only allow for whole field access and rejects any other * type of narrower access. */ - *reg_type = info.reg_type; - *is_retval = info.is_retval; - -if (base_type (*reg_type) ==PTR_TO_BTF_ID ) { -if (info.ref_obj_id && - !find_reference_state (env->cur_state, info.ref_obj_id)) { +if (base_type (info->reg_type) ==PTR_TO_BTF_ID ) { +if (info->ref_obj_id && + !find_reference_state (env->cur_state, info->ref_obj_id)) {verbose (env,"invalid bpf_context access off=%d. Reference may already be released\n" , off);return -EACCES ; } - - *btf = info.btf; - *btf_id = info.btf_id; - *ref_obj_id = info.ref_obj_id; }else { - env->insn_aux_data[insn_idx].ctx_field_size = info.ctx_field_size; + env->insn_aux_data[insn_idx].ctx_field_size = info->ctx_field_size; }/* remember the offset of last byte accessed in ctx */ if (env->prog->aux->max_ctx_offset < off + size)
@@ -7398,11 +7382,12 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regnif (!err && value_regno >=0 && (t ==BPF_READ || rdonly_mem))mark_reg_unknown (env, regs, value_regno); }else if (reg->type ==PTR_TO_CTX ) { -bool is_retval = false;struct bpf_retval_range range; -enum bpf_reg_type reg_type =SCALAR_VALUE ; -struct btf *btf =NULL ; -u32 btf_id =0 , ref_obj_id =0 ; +struct bpf_insn_access_aux info = { + .reg_type =SCALAR_VALUE , + .is_ldsx = is_ldsx, + .log = &env->log, + };if (t ==BPF_WRITE && value_regno >=0 &&is_pointer_value (env, value_regno)) {
@@ -7414,8 +7399,7 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regnif (err <0 )return err; - err =check_ctx_access (env, insn_idx, off, size, t, ®_type, &btf, - &btf_id, &is_retval, is_ldsx, &ref_obj_id); + err =check_ctx_access (env, insn_idx, off, size, t, &info);if (err)verbose_linfo (env, insn_idx,"; " );if (!err && t ==BPF_READ && value_regno >=0 ) {
@@ -7423,8 +7407,8 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn* PTR_TO_PACKET[_META,_END]. In the latter * case, we know the offset is zero. */ -if (reg_type ==SCALAR_VALUE ) { -if (is_retval &&get_func_retval_range (env->prog, &range)) { +if (info.reg_type ==SCALAR_VALUE ) { +if (info.is_retval &&get_func_retval_range (env->prog, &range)) { err =__mark_reg_s32_range (env, regs, value_regno, range.minval, range.maxval);if (err)
@@ -7435,7 +7419,7 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn }else {mark_reg_known_zero (env, regs, value_regno); -if (type_may_be_null (reg_type)) +if (type_may_be_null (info.reg_type)) regs[value_regno].id = ++env->id_gen;/* A load of ctx field could have different * actual load size with the one encoded in the
@@ -7443,13 +7427,13 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn* a sub-register. */ regs[value_regno].subreg_def =DEF_NOT_SUBREG ; -if (base_type (reg_type) ==PTR_TO_BTF_ID ) { - regs[value_regno].btf = btf; - regs[value_regno].btf_id = btf_id; - regs[value_regno].ref_obj_id = ref_obj_id; +if (base_type (info.reg_type) ==PTR_TO_BTF_ID ) { + regs[value_regno].btf = info.btf; + regs[value_regno].btf_id = info.btf_id; + regs[value_regno].ref_obj_id = info.ref_obj_id; } } - regs[value_regno].type = reg_type; + regs[value_regno].type = info.reg_type; } }else if (reg->type ==PTR_TO_STACK ) {
Signature · 1 line
2.47.1
Quoted 21 lines · Amery Hung
Reduce the variable passing madness surrounding
check_ctx_access(). Currently,check_mem_access()passes many pointers to local variables tocheck_ctx_access(). They are used to initialize "structbpf_insn_access_auxinfo" incheck_ctx_access()and then passed tois_valid_access(). Then,check_ctx_access()takes the data our from info and write them back the pointers to pass them back. This can be simpilified by moving info up tocheck_mem_access().No functional change.
Signed-off-by Amery Hung <[email protected]>--- kernel/bpf/verifier.c | 56 ++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 36 deletions(-)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int check_packet_access(struct bpf_verifier_env *env, u32 regno, int off, · line 6009
Quoted 7 lines
kernel/bpf/verifier.c +1
-3@@ -6006,19 +6006,10 @@ static int check_packet_access(struct bpf_verifier_env *env, u32 regno, int off,/* check access to 'struct bpf_context' fields. Supports fixed offsets only */ static int check_ctx_access (struct bpf_verifier_env *env,int insn_idx,int off,int size, -enum bpf_access_type t,enum bpf_reg_type *reg_type, -struct btf **btf,u32 *btf_id,bool *is_retval,bool is_ldsx, -u32 *ref_obj_id) +enum bpf_access_type t,struct bpf_insn_access_aux *info)
Nice cleanup! Thanks, applied.
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Fri, 21 Feb 2025 09:56:44 -0800 you wrote:
Reduce the variable passing madness surrounding
check_ctx_access(). Currently,check_mem_access()passes many pointers to local variables tocheck_ctx_access(). They are used to initialize "structbpf_insn_access_auxinfo" incheck_ctx_access()and then passed tois_valid_access(). Then,check_ctx_access()takes the data our from info and write them back the pointers to pass them back. This can be simpilified by moving info up tocheck_mem_access().[...]
Here is the summary with links:
- bpf: Refactor check_ctx_access()
https://git.kernel.org/bpf/bpf-next/c/201b62ccc831
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html