selftests/bpf: Add missing SPEC_V1-ifdefs

luisgerhorst · Kernel Patches Daemon · commit c8e7a4b62c3f · 2025-10-05T03:50:58.000-07:00
For errors that only occur if bpf_jit_bypass_spec_v1() is set (e.g., on LoongArch), add the missing '#ifdef SPEC_V1' to the selftests. Fixes: 03c68a0 ("bpf, arm64, powerpc: Add bpf_jit_bypass_spec_v1/v4()") Reported-by: Hengqi Chen <hengqi.chen@gmail.com> Closes: https://lore.kernel.org/bpf/CAEyhmHTvj4cDRfu1FXSEXmdCqyWfs3ehw5gtB9qJCrThuUy2Kw@mail.gmail.com/ Signed-off-by: Luis Gerhorst <luis.gerhorst@fau.de>
diff --git a/tools/testing/selftests/bpf/progs/verifier_bounds.c b/tools/testing/selftests/bpf/progs/verifier_bounds.c
@@ -48,7 +48,9 @@ SEC("socket")
 __description("subtraction bounds (map value) variant 2")
 __failure
 __msg("R0 min value is negative, either use unsigned index or do a if (index >=0) check.")
+#ifdef SPEC_V1
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range, prohibited for !root")
+#endif
 __naked void bounds_map_value_variant_2(void)
 {
 	/* unpriv: nospec inserted to prevent "R1 has unknown scalar with mixed
@@ -545,7 +547,9 @@ l1_%=:	exit;						\
 SEC("socket")
 __description("bounds check map access with off+size signed 32bit overflow. test2")
 __failure __msg("pointer offset 1073741822")
+#ifdef SPEC_V1
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __naked void size_signed_32bit_overflow_test2(void)
 {
 	asm volatile ("					\
@@ -572,7 +576,9 @@ l1_%=:	exit;						\
 SEC("socket")
 __description("bounds check map access with off+size signed 32bit overflow. test3")
 __failure __msg("pointer offset -1073741822")
+#ifdef SPEC_V1
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __naked void size_signed_32bit_overflow_test3(void)
 {
 	asm volatile ("					\
diff --git a/tools/testing/selftests/bpf/progs/verifier_direct_stack_access_wraparound.c b/tools/testing/selftests/bpf/progs/verifier_direct_stack_access_wraparound.c
@@ -40,7 +40,9 @@ __naked void with_32_bit_wraparound_test2(void)
 SEC("socket")
 __description("direct stack access with 32-bit wraparound. test3")
 __failure __msg("fp pointer offset 1073741822")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void with_32_bit_wraparound_test3(void)
 {
 	asm volatile ("					\
diff --git a/tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c b/tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c
@@ -218,7 +218,10 @@ void lookup_hash_map_in_map__2(void)
 
 SEC("socket")
 __description("cond: two branches returning different map pointers for lookup (tail, tail)")
-__success __failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+#endif
 __retval(42)
 __naked void pointers_for_lookup_tail_tail_1(void)
 {
diff --git a/tools/testing/selftests/bpf/progs/verifier_runtime_jit.c b/tools/testing/selftests/bpf/progs/verifier_runtime_jit.c
@@ -252,7 +252,10 @@ l1_%=:	call %[bpf_tail_call];				\
 
 SEC("socket")
 __description("runtime/jit: tail_call within bounds, different maps, first branch")
-__success __failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+#endif
 __retval(1)
 __naked void bounds_different_maps_first_branch(void)
 {
@@ -279,7 +282,10 @@ l1_%=:	call %[bpf_tail_call];				\
 
 SEC("socket")
 __description("runtime/jit: tail_call within bounds, different maps, second branch")
-__success __failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("tail_call abusing map_ptr")
+#endif
 __retval(42)
 __naked void bounds_different_maps_second_branch(void)
 {
@@ -341,8 +347,10 @@ __naked void negative_index_to_tail_call(void)
 SEC("socket")
 __description("runtime/jit: pass > 32bit index to tail_call")
 __success __success_unpriv __retval(42)
+#ifdef SPEC_V1
 /* Verifier rewrite for unpriv skips tail call here. */
 __retval_unpriv(2)
+#endif
 __naked void _32bit_index_to_tail_call(void)
 {
 	asm volatile ("					\
diff --git a/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c b/tools/testing/selftests/bpf/progs/verifier_stack_ptr.c
@@ -70,7 +70,9 @@ __naked void load_bad_alignment_on_reg(void)
 SEC("socket")
 __description("PTR_TO_STACK store/load - out of bounds low")
 __failure __msg("invalid write to stack R1 off=-79992 size=8")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void load_out_of_bounds_low(void)
 {
 	asm volatile ("					\
@@ -130,8 +132,10 @@ __naked void to_stack_check_high_2(void)
 
 SEC("socket")
 __description("PTR_TO_STACK check high 3")
-__success __failure_unpriv
-__msg_unpriv("R1 stack pointer arithmetic goes out of range")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __retval(42)
 __naked void to_stack_check_high_3(void)
 {
@@ -148,7 +152,9 @@ __naked void to_stack_check_high_3(void)
 SEC("socket")
 __description("PTR_TO_STACK check high 4")
 __failure __msg("invalid write to stack R1 off=0 size=1")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_high_4(void)
 {
 	asm volatile ("					\
@@ -164,7 +170,9 @@ __naked void to_stack_check_high_4(void)
 SEC("socket")
 __description("PTR_TO_STACK check high 5")
 __failure __msg("invalid write to stack R1")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_high_5(void)
 {
 	asm volatile ("					\
@@ -182,7 +190,9 @@ __naked void to_stack_check_high_5(void)
 SEC("socket")
 __description("PTR_TO_STACK check high 6")
 __failure __msg("invalid write to stack")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_high_6(void)
 {
 	asm volatile ("					\
@@ -201,7 +211,9 @@ __naked void to_stack_check_high_6(void)
 SEC("socket")
 __description("PTR_TO_STACK check high 7")
 __failure __msg("fp pointer offset")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_high_7(void)
 {
 	asm volatile ("					\
@@ -235,8 +247,10 @@ __naked void to_stack_check_low_1(void)
 
 SEC("socket")
 __description("PTR_TO_STACK check low 2")
-__success __failure_unpriv
-__msg_unpriv("R1 stack pointer arithmetic goes out of range")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __retval(42)
 __naked void to_stack_check_low_2(void)
 {
@@ -253,7 +267,9 @@ __naked void to_stack_check_low_2(void)
 SEC("socket")
 __description("PTR_TO_STACK check low 3")
 __failure __msg("invalid write to stack R1 off=-513 size=1")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_low_3(void)
 {
 	asm volatile ("					\
@@ -287,7 +303,9 @@ __naked void to_stack_check_low_4(void)
 SEC("socket")
 __description("PTR_TO_STACK check low 5")
 __failure __msg("invalid write to stack")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_low_5(void)
 {
 	asm volatile ("					\
@@ -305,7 +323,9 @@ __naked void to_stack_check_low_5(void)
 SEC("socket")
 __description("PTR_TO_STACK check low 6")
 __failure __msg("invalid write to stack")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_low_6(void)
 {
 	asm volatile ("					\
@@ -324,7 +344,9 @@ __naked void to_stack_check_low_6(void)
 SEC("socket")
 __description("PTR_TO_STACK check low 7")
 __failure __msg("fp pointer offset")
+#ifdef SPEC_V1
 __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __naked void to_stack_check_low_7(void)
 {
 	asm volatile ("					\
diff --git a/tools/testing/selftests/bpf/progs/verifier_unpriv.c b/tools/testing/selftests/bpf/progs/verifier_unpriv.c
@@ -699,8 +699,10 @@ l0_%=:	r0 = 0;						\
 
 SEC("socket")
 __description("unpriv: adding of fp, reg")
-__success __failure_unpriv
-__msg_unpriv("R1 stack pointer arithmetic goes out of range")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __retval(0)
 __naked void unpriv_adding_of_fp_reg(void)
 {
@@ -715,8 +717,10 @@ __naked void unpriv_adding_of_fp_reg(void)
 
 SEC("socket")
 __description("unpriv: adding of fp, imm")
-__success __failure_unpriv
-__msg_unpriv("R1 stack pointer arithmetic goes out of range")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("R1 stack pointer arithmetic goes out of range")
+#endif
 __retval(0)
 __naked void unpriv_adding_of_fp_imm(void)
 {
diff --git a/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c b/tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c
@@ -379,8 +379,10 @@ l2_%=:	r0 = 1;						\
 
 SEC("socket")
 __description("map access: value_ptr -= known scalar from different maps")
-__success __failure_unpriv
-__msg_unpriv("R0 min value is outside of the allowed memory range")
+__success
+#ifdef SPEC_V1
+__failure_unpriv __msg_unpriv("R0 min value is outside of the allowed memory range")
+#endif
 __retval(1)
 __naked void known_scalar_from_different_maps(void)
 {
@@ -669,8 +671,11 @@ __naked void alu_with_different_scalars_3(void)
 
 SEC("socket")
 __description("map access: value_ptr += known scalar, upper oob arith, test 1")
-__success __failure_unpriv
+__success 
+#ifdef SPEC_V1
+__failure_unpriv
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __retval(1)
 __naked void upper_oob_arith_test_1(void)
 {
@@ -696,8 +701,11 @@ l0_%=:	r0 = 1;						\
 
 SEC("socket")
 __description("map access: value_ptr += known scalar, upper oob arith, test 2")
-__success __failure_unpriv
+__success 
+#ifdef SPEC_V1
+__failure_unpriv
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __retval(1)
 __naked void upper_oob_arith_test_2(void)
 {
@@ -749,8 +757,10 @@ l0_%=:	r0 = 1;						\
 SEC("socket")
 __description("map access: value_ptr -= known scalar, lower oob arith, test 1")
 __failure __msg("R0 min value is outside of the allowed memory range")
+#ifdef SPEC_V1
 __failure_unpriv
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __naked void lower_oob_arith_test_1(void)
 {
 	asm volatile ("					\
@@ -776,8 +786,11 @@ l0_%=:	r0 = 1;						\
 
 SEC("socket")
 __description("map access: value_ptr -= known scalar, lower oob arith, test 2")
-__success __failure_unpriv
+__success
+#ifdef SPEC_V1
+__failure_unpriv
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __retval(1)
 __naked void lower_oob_arith_test_2(void)
 {
@@ -1084,8 +1097,11 @@ l0_%=:	exit;						\
 
 SEC("socket")
 __description("map access: unknown scalar += value_ptr, 3")
-__success __failure_unpriv
+__success
+#ifdef SPEC_V1
+__failure_unpriv
 __msg_unpriv("R0 pointer arithmetic of map value goes out of range")
+#endif
 __retval(0xabcdef12) __flag(BPF_F_ANY_ALIGNMENT)
 __naked void unknown_scalar_value_ptr_3(void)
 {
@@ -1115,7 +1131,9 @@ l0_%=:	exit;						\
 SEC("socket")
 __description("map access: unknown scalar += value_ptr, 4")
 __failure __msg("R1 max value is outside of the allowed memory range")
+#ifdef SPEC_V1
 __msg_unpriv("R1 pointer arithmetic of map value goes out of range")
+#endif
 __flag(BPF_F_ANY_ALIGNMENT)
 __naked void unknown_scalar_value_ptr_4(void)
 {
diff --git a/tools/testing/selftests/bpf/progs/verifier_var_off.c b/tools/testing/selftests/bpf/progs/verifier_var_off.c
