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

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

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-26-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 d9180da..d8d4464 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -22,6 +22,7 @@
 #include "verifier_helper_restricted.skel.h"
 #include "verifier_helper_value_access.skel.h"
 #include "verifier_int_ptr.skel.h"
+#include "verifier_ld_ind.skel.h"
 
 __maybe_unused
 static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -66,3 +67,4 @@ void test_verifier_helper_packet_access(void) { RUN(verifier_helper_packet_acces
 void test_verifier_helper_restricted(void)    { RUN(verifier_helper_restricted); }
 void test_verifier_helper_value_access(void)  { RUN(verifier_helper_value_access); }
 void test_verifier_int_ptr(void)              { RUN(verifier_int_ptr); }
+void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_ld_ind.c b/tools/testing/selftests/bpf/progs/verifier_ld_ind.c
new file mode 100644 (file)
index 0000000..c925ba9
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_ld_ind.c
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/ld_ind.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "../../../include/linux/filter.h"
+#include "bpf_misc.h"
+
+SEC("socket")
+__description("ld_ind: check calling conv, r1")
+__failure __msg("R1 !read_ok")
+__failure_unpriv
+__naked void ind_check_calling_conv_r1(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r1 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r1;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_1, -0x200000))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ld_ind: check calling conv, r2")
+__failure __msg("R2 !read_ok")
+__failure_unpriv
+__naked void ind_check_calling_conv_r2(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r2 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r2;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_2, -0x200000))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ld_ind: check calling conv, r3")
+__failure __msg("R3 !read_ok")
+__failure_unpriv
+__naked void ind_check_calling_conv_r3(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r3 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r3;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_3, -0x200000))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ld_ind: check calling conv, r4")
+__failure __msg("R4 !read_ok")
+__failure_unpriv
+__naked void ind_check_calling_conv_r4(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r4 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r4;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_4, -0x200000))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ld_ind: check calling conv, r5")
+__failure __msg("R5 !read_ok")
+__failure_unpriv
+__naked void ind_check_calling_conv_r5(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r5 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r5;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_5, -0x200000))
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("ld_ind: check calling conv, r7")
+__success __success_unpriv __retval(1)
+__naked void ind_check_calling_conv_r7(void)
+{
+       asm volatile ("                                 \
+       r6 = r1;                                        \
+       r7 = 1;                                         \
+       .8byte %[ld_ind];                               \
+       r0 = r7;                                        \
+       exit;                                           \
+"      :
+       : __imm_insn(ld_ind, BPF_LD_IND(BPF_W, BPF_REG_7, -0x200000))
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/ld_ind.c b/tools/testing/selftests/bpf/verifier/ld_ind.c
deleted file mode 100644 (file)
index 0797342..0000000
--- a/tools/testing/selftests/bpf/verifier/ld_ind.c
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-       "ld_ind: check calling conv, r1",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_1, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_1, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R1 !read_ok",
-       .result = REJECT,
-},
-{
-       "ld_ind: check calling conv, r2",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_2, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_2, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_2),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R2 !read_ok",
-       .result = REJECT,
-},
-{
-       "ld_ind: check calling conv, r3",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_3, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_3, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_3),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R3 !read_ok",
-       .result = REJECT,
-},
-{
-       "ld_ind: check calling conv, r4",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_4, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_4, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_4),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R4 !read_ok",
-       .result = REJECT,
-},
-{
-       "ld_ind: check calling conv, r5",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_5, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_5, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_5),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R5 !read_ok",
-       .result = REJECT,
-},
-{
-       "ld_ind: check calling conv, r7",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),
-       BPF_MOV64_IMM(BPF_REG_7, 1),
-       BPF_LD_IND(BPF_W, BPF_REG_7, -0x200000),
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_7),
-       BPF_EXIT_INSN(),
-       },
-       .result = ACCEPT,
-       .retval = 1,
-},