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

selftests/bpf: Remove bpf_assert_eq-like macros. 



Since the last user was converted to bpf_cmp, remove bpf_assert_eq/ne/... macros.

__bpf_assert_op() macro is kept for experiments, since it's slightly more efficient
than bpf_assert(bpf_cmp_unlikely()) until LLVM is fixed.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/bpf/20231226191148.48536-5-alexei.starovoitov@gmail.com
parent 624cd2a1

tools/testing/selftests/bpf/bpf_experimental.h

+0 −150
Original line number Diff line number Diff line
@@ -341,156 +341,6 @@ l_true: \ 
 */

#define bpf_assert_with(cond, value) if (!(cond)) bpf_throw(value);



/* Description

 *	Assert that LHS is equal to RHS. This statement updates the known value

 *	of LHS during verification. Note that RHS must be a constant value, and

 *	must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the value zero when the assertion fails.

 */

#define bpf_assert_eq(LHS, RHS)						\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, ==, RHS, 0, true);			\

	})



/* Description

 *	Assert that LHS is equal to RHS. This statement updates the known value

 *	of LHS during verification. Note that RHS must be a constant value, and

 *	must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the specified value when the assertion fails.

 */

#define bpf_assert_eq_with(LHS, RHS, value)				\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, ==, RHS, value, true);		\

	})



/* Description

 *	Assert that LHS is less than RHS. This statement updates the known

 *	bounds of LHS during verification. Note that RHS must be a constant

 *	value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the value zero when the assertion fails.

 */

#define bpf_assert_lt(LHS, RHS)						\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, <, RHS, 0, false);			\

	})



/* Description

 *	Assert that LHS is less than RHS. This statement updates the known

 *	bounds of LHS during verification. Note that RHS must be a constant

 *	value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the specified value when the assertion fails.

 */

#define bpf_assert_lt_with(LHS, RHS, value)				\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, <, RHS, value, false);		\

	})



/* Description

 *	Assert that LHS is greater than RHS. This statement updates the known

 *	bounds of LHS during verification. Note that RHS must be a constant

 *	value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the value zero when the assertion fails.

 */

#define bpf_assert_gt(LHS, RHS)						\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, >, RHS, 0, false);			\

	})



/* Description

 *	Assert that LHS is greater than RHS. This statement updates the known

 *	bounds of LHS during verification. Note that RHS must be a constant

 *	value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the specified value when the assertion fails.

 */

#define bpf_assert_gt_with(LHS, RHS, value)				\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, >, RHS, value, false);		\

	})



/* Description

 *	Assert that LHS is less than or equal to RHS. This statement updates the

 *	known bounds of LHS during verification. Note that RHS must be a

 *	constant value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the value zero when the assertion fails.

 */

#define bpf_assert_le(LHS, RHS)						\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, <=, RHS, 0, false);		\

	})



/* Description

 *	Assert that LHS is less than or equal to RHS. This statement updates the

 *	known bounds of LHS during verification. Note that RHS must be a

 *	constant value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the specified value when the assertion fails.

 */

#define bpf_assert_le_with(LHS, RHS, value)				\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, <=, RHS, value, false);		\

	})



/* Description

 *	Assert that LHS is greater than or equal to RHS. This statement updates

 *	the known bounds of LHS during verification. Note that RHS must be a

 *	constant value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the value zero when the assertion fails.

 */

#define bpf_assert_ge(LHS, RHS)						\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, >=, RHS, 0, false);		\

	})



/* Description

 *	Assert that LHS is greater than or equal to RHS. This statement updates

 *	the known bounds of LHS during verification. Note that RHS must be a

 *	constant value, and must fit within the data type of LHS.

 * Returns

 *	Void.

 * Throws

 *	An exception with the specified value when the assertion fails.

 */

#define bpf_assert_ge_with(LHS, RHS, value)				\

	({								\

		barrier_var(LHS);					\

		__bpf_assert_op(LHS, >=, RHS, value, false);		\

	})



/* Description

 *	Assert that LHS is in the range [BEG, END] (inclusive of both). This

 *	statement updates the known bounds of LHS during verification. Note