bpf: move explored_state() closer to the beginning of verifier.c

commit 3c4e420cb6536026ddd50eaaff5f30e4f144200d upstream.

Subsequent patches would make use of explored_state() function.
Move it up to avoid adding unnecessary prototype.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20231024000917.12153-2-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 97fd176..6960978 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1786,6 +1786,19 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state,
        return 0;
 }
 
+static u32 state_htab_size(struct bpf_verifier_env *env)
+{
+       return env->prog->len;
+}
+
+static struct bpf_verifier_state_list **explored_state(struct bpf_verifier_env *env, int idx)
+{
+       struct bpf_verifier_state *cur = env->cur_state;
+       struct bpf_func_state *state = cur->frame[cur->curframe];
+
+       return &env->explored_states[(idx ^ state->callsite) % state_htab_size(env)];
+}
+
 static void update_branch_counts(struct bpf_verifier_env *env, struct bpf_verifier_state *st)
 {
        while (st) {
@@ -14702,21 +14715,6 @@ enum {
        BRANCH = 2,
 };
 
-static u32 state_htab_size(struct bpf_verifier_env *env)
-{
-       return env->prog->len;
-}
-
-static struct bpf_verifier_state_list **explored_state(
-                                       struct bpf_verifier_env *env,
-                                       int idx)
-{
-       struct bpf_verifier_state *cur = env->cur_state;
-       struct bpf_func_state *state = cur->frame[cur->curframe];
-
-       return &env->explored_states[(idx ^ state->callsite) % state_htab_size(env)];
-}
-
 static void mark_prune_point(struct bpf_verifier_env *env, int idx)
 {
        env->insn_aux_data[idx].prune_point = true;