bpf: remove unused insn_cnt argument from visit_[func_call_]insn()
Andrii Nakryiko
maintainerPATCH 1/1 bpf: remove unused insn_cnt argument from visit_[func_call_]insn()
Number of total instructions in BPF program (including subprogs) can and is accessed from env->prog->len. visit_func_call_insn() doesn't do any checks against insn_cnt anymore, relying on push_insn() to do this check internally. So remove unnecessary insn_cnt input argument from visit_func_call_insn() and visit_insn() functions.
--- kernel/bpf/verifier.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/bpf/verifier.c +5 -6
@@ -12222,8 +12222,7 @@ static int push_insn(int t, int w, int e, struct bpf_verifier_env *env,return DONE_EXPLORING ; } -static int visit_func_call_insn (int t,int insn_cnt, -struct bpf_insn *insns, +static int visit_func_call_insn (int t,struct bpf_insn *insns,struct bpf_verifier_env *env,bool visit_callee) {
@@ -12254,13 +12253,13 @@ static int visit_func_call_insn(int t, int insn_cnt,* DONE_EXPLORING - the instruction was fully explored * KEEP_EXPLORING - there is still work to be done before it is fully explored */ -static int visit_insn (int t,int insn_cnt,struct bpf_verifier_env *env) +static int visit_insn (int t,struct bpf_verifier_env *env) {struct bpf_insn *insns = env->prog->insnsi;int ret;if (bpf_pseudo_func (insns + t)) -return visit_func_call_insn (t, insn_cnt, insns, env, true); +return visit_func_call_insn (t, insns, env, true);/* All non-branch instructions have a single fall-through edge. */ if (BPF_CLASS(insns[t].code) != BPF_JMP &&
@@ -12279,7 +12278,7 @@ static int visit_insn(int t, int insn_cnt, struct bpf_verifier_env *env)* async state will be pushed for further exploration. */ mark_prune_point (env, t); -return visit_func_call_insn (t, insn_cnt, insns, env, +return visit_func_call_insn (t, insns, env, insns[t].src_reg ==BPF_PSEUDO_CALL );case BPF_JA :
@@ -12336,7 +12335,7 @@ static int check_cfg(struct bpf_verifier_env *env)while (env->cfg.cur_stack >0 ) {int t = insn_stack[env->cfg.cur_stack -1 ]; - ret =visit_insn (t, insn_cnt, env); + ret =visit_insn (t, env);switch (ret) {case DONE_EXPLORING : insn_state[t] =EXPLORED ;
Signature · 1 line
2.30.2
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 10 lines · On Wed, 7 Dec 2022 11:55:34 -0800 you wrote:
Number of total instructions in BPF program (including subprogs) can and is accessed from
env->prog->len.visit_func_call_insn()doesn't do any checks againstinsn_cntanymore, relying onpush_insn()to do this check internally. So remove unnecessaryinsn_cntinput argument fromvisit_func_call_insn()andvisit_insn()functions.Suggested-by Alexei Starovoitov <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: remove unused insn_cnt argument from visit_[func_call_]insn()
https://git.kernel.org/bpf/bpf-next/c/dcb2288b1fd9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html