Commit ff8867af authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

bpf: rename BPF_F_TEST_SANITY_STRICT to BPF_F_TEST_REG_INVARIANTS 

Rename verifier internal flag BPF_F_TEST_SANITY_STRICT to more neutral
BPF_F_TEST_REG_INVARIANTS. This is a follow up to [0].

A few selftests and veristat need to be adjusted in the same patch as
well.

  [0] https://patchwork.kernel.org/project/netdevbpf/patch/20231112010609.848406-5-andrii@kernel.org/



Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20231117171404.225508-1-andrii@kernel.org


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

include/linux/bpf_verifier.h

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ struct bpf_verifier_env { 
	int stack_size;			/* number of states to be processed */

	bool strict_alignment;		/* perform strict pointer alignment checks */

	bool test_state_freq;		/* test verifier with different pruning frequency */

	bool test_sanity_strict;	/* fail verification on sanity violations */

	bool test_reg_invariants;	/* fail verification on register invariants violations */

	struct bpf_verifier_state *cur_state; /* current verifier state */

	struct bpf_verifier_state_list **explored_states; /* search pruning optimization */

	struct bpf_verifier_state_list *free_list;

include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ enum bpf_perf_event_type { 
#define BPF_F_XDP_DEV_BOUND_ONLY	(1U << 6)



/* The verifier internal test flag. Behavior is undefined */

#define BPF_F_TEST_SANITY_STRICT	(1U << 7)

#define BPF_F_TEST_REG_INVARIANTS	(1U << 7)



/* link_create.kprobe_multi.flags used in LINK_CREATE command for

 * BPF_TRACE_KPROBE_MULTI attach type to create return probe.

kernel/bpf/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -2574,7 +2574,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) 
				 BPF_F_TEST_RND_HI32 |

				 BPF_F_XDP_HAS_FRAGS |

				 BPF_F_XDP_DEV_BOUND_ONLY |

				 BPF_F_TEST_SANITY_STRICT))

				 BPF_F_TEST_REG_INVARIANTS))

		return -EINVAL;



	if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&

kernel/bpf/verifier.c

+3 −3
Original line number Diff line number Diff line
@@ -2608,14 +2608,14 @@ static int reg_bounds_sanity_check(struct bpf_verifier_env *env, 








	return 0;









out:









	verbose(env, "REG SANITY VIOLATION (%s): %s u64=[%#llx, %#llx] "









	verbose(env, "REG INVARIANTS VIOLATION (%s): %s u64=[%#llx, %#llx] "









		"s64=[%#llx, %#llx] u32=[%#x, %#x] s32=[%#x, %#x] var_off=(%#llx, %#llx)\n",









		ctx, msg, reg->umin_value, reg->umax_value,









		reg->smin_value, reg->smax_value,









		reg->u32_min_value, reg->u32_max_value,









		reg->s32_min_value, reg->s32_max_value,









		reg->var_off.value, reg->var_off.mask);









	if (env->test_sanity_strict)









	if (env->test_reg_invariants)









		return -EFAULT;









	__mark_reg_unbounded(reg);









	return 0;








@@ -20791,7 +20791,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr, __u3















	if (is_priv)









		env->test_state_freq = attr->prog_flags & BPF_F_TEST_STATE_FREQ;









	env->test_sanity_strict = attr->prog_flags & BPF_F_TEST_SANITY_STRICT;









	env->test_reg_invariants = attr->prog_flags & BPF_F_TEST_REG_INVARIANTS;

















	env->explored_states = kvcalloc(state_htab_size(env),









				       sizeof(struct bpf_verifier_state_list *),

























tools/include/uapi/linux/bpf.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -1201,7 +1201,7 @@ enum bpf_perf_event_type {







#define BPF_F_XDP_DEV_BOUND_ONLY	(1U << 6)



















/* The verifier internal test flag. Behavior is undefined */









#define BPF_F_TEST_SANITY_STRICT	(1U << 7)









#define BPF_F_TEST_REG_INVARIANTS	(1U << 7)



















/* link_create.kprobe_multi.flags used in LINK_CREATE command for









 * BPF_TRACE_KPROBE_MULTI attach type to create return probe.