bpf: removed unused 'env' parameter from is_reg64 and insn_has_def32

Parameter 'env' is not used by is_reg64() and insn_has_def32()
functions. Remove the parameter to make it clear that neither function
depends on 'env' state, e.g. env->insn_aux_data.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20250807010205.3210608-2-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 0806295945e4006bae53513570f1c75545228c8d..69eb2b5c2218b2298640f0964da44617b9bba211 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -3663,7 +3663,7 @@ static int mark_irq_flag_read(struct bpf_verifier_env *env, struct bpf_reg_state
  * code only. It returns TRUE if the source or destination register operates
  * on 64-bit, otherwise return FALSE.
  */
-static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn,
+static bool is_reg64(struct bpf_insn *insn,
                     u32 regno, struct bpf_reg_state *reg, enum reg_arg_type t)
 {
        u8 code, class, op;
@@ -3774,14 +3774,14 @@ static int insn_def_regno(const struct bpf_insn *insn)
 }
 
 /* Return TRUE if INSN has defined any 32-bit value explicitly. */
-static bool insn_has_def32(struct bpf_verifier_env *env, struct bpf_insn *insn)
+static bool insn_has_def32(struct bpf_insn *insn)
 {
        int dst_reg = insn_def_regno(insn);
 
        if (dst_reg == -1)
                return false;
 
-       return !is_reg64(env, insn, dst_reg, NULL, DST_OP);
+       return !is_reg64(insn, dst_reg, NULL, DST_OP);
 }
 
 static void mark_insn_zext(struct bpf_verifier_env *env,
@@ -3812,7 +3812,7 @@ static int __check_reg_arg(struct bpf_verifier_env *env, struct bpf_reg_state *r
        mark_reg_scratched(env, regno);
 
        reg = &regs[regno];
-       rw64 = is_reg64(env, insn, regno, reg, t);
+       rw64 = is_reg64(insn, regno, reg, t);
        if (t == SRC_OP) {
                /* check whether register used as source operand can be read */
                if (reg->type == NOT_INIT) {
@@ -20712,7 +20712,7 @@ static void adjust_insn_aux_data(struct bpf_verifier_env *env,
         * (cnt == 1) is taken or not. There is no guarantee INSN at OFF is the
         * original insn at old prog.
         */
-       old_data[off].zext_dst = insn_has_def32(env, insn + off + cnt - 1);
+       old_data[off].zext_dst = insn_has_def32(insn + off + cnt - 1);
 
        if (cnt == 1)
                return;
@@ -20724,7 +20724,7 @@ static void adjust_insn_aux_data(struct bpf_verifier_env *env,
        for (i = off; i < off + cnt - 1; i++) {
                /* Expand insni[off]'s seen count to the patched range. */
                new_data[i].seen = old_seen;
-               new_data[i].zext_dst = insn_has_def32(env, insn + i);
+               new_data[i].zext_dst = insn_has_def32(insn + i);
        }
        env->insn_aux_data = new_data;
        vfree(old_data);
@@ -21131,7 +21131,7 @@ static int opt_subreg_zext_lo32_rnd_hi32(struct bpf_verifier_env *env,
                         *       BPF_STX + SRC_OP, so it is safe to pass NULL
                         *       here.
                         */
-                       if (is_reg64(env, &insn, load_reg, NULL, DST_OP)) {
+                       if (is_reg64(&insn, load_reg, NULL, DST_OP)) {
                                if (class == BPF_LD &&
                                    BPF_MODE(code) == BPF_IMM)
                                        i++;