selftests/bpf: verifier/and.c converted to inline assembly

Test verifier/and.c automatically converted to use inline assembly.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-7-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/verifier.c b/tools/testing/selftests/bpf/prog_tests/verifier.c
index aa63f5d..34526f6 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -3,6 +3,7 @@
 #include <test_progs.h>
 
 #include "cap_helpers.h"
+#include "verifier_and.skel.h"
 
 __maybe_unused
 static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -27,3 +28,5 @@ static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_fac
 }
 
 #define RUN(skel) run_tests_aux(#skel, skel##__elf_bytes)
+
+void test_verifier_and(void)                  { RUN(verifier_and); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_and.c b/tools/testing/selftests/bpf/progs/verifier_and.c
new file mode 100644 (file)
index 0000000..e97e518
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_and.c
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/and.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+#define MAX_ENTRIES 11
+
+struct test_val {
+       unsigned int index;
+       int foo[MAX_ENTRIES];
+};
+
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __uint(max_entries, 1);
+       __type(key, long long);
+       __type(value, struct test_val);
+} map_hash_48b SEC(".maps");
+
+SEC("socket")
+__description("invalid and of negative number")
+__failure __msg("R0 max value is outside of the allowed memory range")
+__failure_unpriv
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void invalid_and_of_negative_number(void)
+{
+       asm volatile ("                                 \
+       r1 = 0;                                         \
+       *(u64*)(r10 - 8) = r1;                          \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r1 = *(u8*)(r0 + 0);                            \
+       r1 &= -4;                                       \
+       r1 <<= 2;                                       \
+       r0 += r1;                                       \
+l0_%=: r1 = %[test_val_foo];                           \
+       *(u64*)(r0 + 0) = r1;                           \
+       exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b),
+         __imm_const(test_val_foo, offsetof(struct test_val, foo))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("invalid range check")
+__failure __msg("R0 max value is outside of the allowed memory range")
+__failure_unpriv
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void invalid_range_check(void)
+{
+       asm volatile ("                                 \
+       r1 = 0;                                         \
+       *(u64*)(r10 - 8) = r1;                          \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r1 = *(u32*)(r0 + 0);                           \
+       r9 = 1;                                         \
+       w1 %%= 2;                                       \
+       w1 += 1;                                        \
+       w9 &= w1;                                       \
+       w9 += 1;                                        \
+       w9 >>= 1;                                       \
+       w3 = 1;                                         \
+       w3 -= w9;                                       \
+       w3 *= 0x10000000;                               \
+       r0 += r3;                                       \
+       *(u32*)(r0 + 0) = r3;                           \
+l0_%=: r0 = r0;                                        \
+       exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("check known subreg with unknown reg")
+__success __failure_unpriv __msg_unpriv("R1 !read_ok")
+__retval(0)
+__naked void known_subreg_with_unknown_reg(void)
+{
+       asm volatile ("                                 \
+       call %[bpf_get_prandom_u32];                    \
+       r0 <<= 32;                                      \
+       r0 += 1;                                        \
+       r0 &= 0xFFFF1234;                               \
+       /* Upper bits are unknown but AND above masks out 1 zero'ing lower bits */\
+       if w0 < 1 goto l0_%=;                           \
+       r1 = *(u32*)(r1 + 512);                         \
+l0_%=: r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_get_prandom_u32)
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/and.c b/tools/testing/selftests/bpf/verifier/and.c
deleted file mode 100644 (file)
index 7d7ebee..0000000
--- a/tools/testing/selftests/bpf/verifier/and.c
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-       "invalid and of negative number",
-       .insns = {
-       BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 4),
-       BPF_LDX_MEM(BPF_B, BPF_REG_1, BPF_REG_0, 0),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_1, -4),
-       BPF_ALU64_IMM(BPF_LSH, BPF_REG_1, 2),
-       BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, offsetof(struct test_val, foo)),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr = "R0 max value is outside of the allowed memory range",
-       .result = REJECT,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},
-{
-       "invalid range check",
-       .insns = {
-       BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 12),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_0, 0),
-       BPF_MOV64_IMM(BPF_REG_9, 1),
-       BPF_ALU32_IMM(BPF_MOD, BPF_REG_1, 2),
-       BPF_ALU32_IMM(BPF_ADD, BPF_REG_1, 1),
-       BPF_ALU32_REG(BPF_AND, BPF_REG_9, BPF_REG_1),
-       BPF_ALU32_IMM(BPF_ADD, BPF_REG_9, 1),
-       BPF_ALU32_IMM(BPF_RSH, BPF_REG_9, 1),
-       BPF_MOV32_IMM(BPF_REG_3, 1),
-       BPF_ALU32_REG(BPF_SUB, BPF_REG_3, BPF_REG_9),
-       BPF_ALU32_IMM(BPF_MUL, BPF_REG_3, 0x10000000),
-       BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_3),
-       BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_3, 0),
-       BPF_MOV64_REG(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr = "R0 max value is outside of the allowed memory range",
-       .result = REJECT,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},
-{
-       "check known subreg with unknown reg",
-       .insns = {
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_prandom_u32),
-       BPF_ALU64_IMM(BPF_LSH, BPF_REG_0, 32),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_0, 1),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xFFFF1234),
-       /* Upper bits are unknown but AND above masks out 1 zero'ing lower bits */
-       BPF_JMP32_IMM(BPF_JLT, BPF_REG_0, 1, 1),
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1, 512),
-       BPF_MOV64_IMM(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .errstr_unpriv = "R1 !read_ok",
-       .result_unpriv = REJECT,
-       .result = ACCEPT,
-       .retval = 0
-},