Commit c82834a5 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

bpf: Move state equivalence logic to states.c 



verifier.c is huge. Move is_state_visited() to states.c,
so that all state equivalence logic is in one file.

Mechanical move. No functional changes.

Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20260412152936.54262-5-alexei.starovoitov@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent f8a8face

include/linux/bpf_verifier.h

+67 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,73 @@ void bpf_free_kfunc_btf_tab(struct bpf_kfunc_btf_tab *tab); 


int mark_chain_precision(struct bpf_verifier_env *env, int regno);



int bpf_is_state_visited(struct bpf_verifier_env *env, int insn_idx);

int bpf_update_branch_counts(struct bpf_verifier_env *env, struct bpf_verifier_state *st);



void bpf_clear_jmp_history(struct bpf_verifier_state *state);

int bpf_copy_verifier_state(struct bpf_verifier_state *dst_state,

			    const struct bpf_verifier_state *src);

struct list_head *bpf_explored_state(struct bpf_verifier_env *env, int idx);

void bpf_free_verifier_state(struct bpf_verifier_state *state, bool free_self);

void bpf_free_backedges(struct bpf_scc_visit *visit);

int bpf_push_jmp_history(struct bpf_verifier_env *env, struct bpf_verifier_state *cur,

			 int insn_flags, u64 linked_regs);

void bpf_mark_reg_not_init(const struct bpf_verifier_env *env,

			   struct bpf_reg_state *reg);

void bpf_mark_reg_unknown_imprecise(struct bpf_reg_state *reg);

void bpf_mark_all_scalars_precise(struct bpf_verifier_env *env,

				  struct bpf_verifier_state *st);

void bpf_clear_singular_ids(struct bpf_verifier_env *env, struct bpf_verifier_state *st);

int bpf_mark_chain_precision(struct bpf_verifier_env *env,

			     struct bpf_verifier_state *starting_state,

			     int regno, bool *changed);



static inline int bpf_get_spi(s32 off)

{

	return (-off - 1) / BPF_REG_SIZE;

}



static inline struct bpf_func_state *bpf_func(struct bpf_verifier_env *env,

					      const struct bpf_reg_state *reg)

{

	struct bpf_verifier_state *cur = env->cur_state;



	return cur->frame[reg->frameno];

}



/* Return IP for a given frame in a call stack */

static inline u32 bpf_frame_insn_idx(struct bpf_verifier_state *st, u32 frame)

{

	return frame == st->curframe

	       ? st->insn_idx

	       : st->frame[frame + 1]->callsite;

}



static inline bool bpf_is_jmp_point(struct bpf_verifier_env *env, int insn_idx)

{

	return env->insn_aux_data[insn_idx].jmp_point;

}



static inline bool bpf_is_spilled_reg(const struct bpf_stack_state *stack)

{

	return stack->slot_type[BPF_REG_SIZE - 1] == STACK_SPILL;

}



static inline bool bpf_register_is_null(struct bpf_reg_state *reg)

{

	return reg->type == SCALAR_VALUE && tnum_equals_const(reg->var_off, 0);

}



static inline void bpf_bt_set_frame_reg(struct backtrack_state *bt, u32 frame, u32 reg)

{

	bt->reg_masks[frame] |= 1 << reg;

}



static inline void bpf_bt_set_frame_slot(struct backtrack_state *bt, u32 frame, u32 slot)

{

	bt->stack_masks[frame] |= 1ull << slot;

}



bool bpf_map_is_rdonly(const struct bpf_map *map);

int bpf_map_direct_read(struct bpf_map *map, int off, int size, u64 *val,

			bool is_ldsx);

kernel/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-$(CONFIG_BPF_SYSCALL) += bpf_iter.o map_iter.o task_iter.o prog_iter.o link_ 
obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o bloom_filter.o

obj-$(CONFIG_BPF_SYSCALL) += local_storage.o queue_stack_maps.o ringbuf.o bpf_insn_array.o

obj-$(CONFIG_BPF_SYSCALL) += bpf_local_storage.o bpf_task_storage.o

obj-$(CONFIG_BPF_SYSCALL) += fixups.o cfg.o

obj-$(CONFIG_BPF_SYSCALL) += fixups.o cfg.o states.o

obj-${CONFIG_BPF_LSM}	  += bpf_inode_storage.o

obj-$(CONFIG_BPF_SYSCALL) += disasm.o mprog.o

obj-$(CONFIG_BPF_JIT) += trampoline.o

kernel/bpf/states.c

0 → 100644
+1563 −0

File added.

Preview size limit exceeded, changes collapsed.

kernel/bpf/verifier.c

+134 −1745

File changed.

Preview size limit exceeded, changes collapsed.