selftests/bpf: verifier/d_path converted to inline assembly

Test verifier/d_path automatically converted to use inline assembly.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230421174234.2391278-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 1a1fd3b..ec4c201 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -19,6 +19,7 @@
 #include "verifier_const_or.skel.h"
 #include "verifier_ctx.skel.h"
 #include "verifier_ctx_sk_msg.skel.h"
+#include "verifier_d_path.skel.h"
 #include "verifier_direct_stack_access_wraparound.skel.h"
 #include "verifier_div0.skel.h"
 #include "verifier_div_overflow.skel.h"
@@ -99,6 +100,7 @@ void test_verifier_cgroup_storage(void)       { RUN(verifier_cgroup_storage); }
 void test_verifier_const_or(void)             { RUN(verifier_const_or); }
 void test_verifier_ctx(void)                  { RUN(verifier_ctx); }
 void test_verifier_ctx_sk_msg(void)           { RUN(verifier_ctx_sk_msg); }
+void test_verifier_d_path(void)               { RUN(verifier_d_path); }
 void test_verifier_direct_stack_access_wraparound(void) { RUN(verifier_direct_stack_access_wraparound); }
 void test_verifier_div0(void)                 { RUN(verifier_div0); }
 void test_verifier_div_overflow(void)         { RUN(verifier_div_overflow); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_d_path.c b/tools/testing/selftests/bpf/progs/verifier_d_path.c
new file mode 100644 (file)
index 0000000..ec79cbc
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_d_path.c
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/d_path.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+SEC("fentry/dentry_open")
+__description("d_path accept")
+__success __retval(0)
+__naked void d_path_accept(void)
+{
+       asm volatile ("                                 \
+       r1 = *(u32*)(r1 + 0);                           \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r6 = 0;                                         \
+       *(u64*)(r2 + 0) = r6;                           \
+       r3 = 8 ll;                                      \
+       call %[bpf_d_path];                             \
+       r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_d_path)
+       : __clobber_all);
+}
+
+SEC("fentry/d_path")
+__description("d_path reject")
+__failure __msg("helper call is not allowed in probe")
+__naked void d_path_reject(void)
+{
+       asm volatile ("                                 \
+       r1 = *(u32*)(r1 + 0);                           \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r6 = 0;                                         \
+       *(u64*)(r2 + 0) = r6;                           \
+       r3 = 8 ll;                                      \
+       call %[bpf_d_path];                             \
+       r0 = 0;                                         \
+       exit;                                           \
+"      :
+       : __imm(bpf_d_path)
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/d_path.c b/tools/testing/selftests/bpf/verifier/d_path.c
deleted file mode 100644 (file)
index b988396..0000000
--- a/tools/testing/selftests/bpf/verifier/d_path.c
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-       "d_path accept",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1, 0),
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_MOV64_IMM(BPF_REG_6, 0),
-       BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_6, 0),
-       BPF_LD_IMM64(BPF_REG_3, 8),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_d_path),
-       BPF_MOV64_IMM(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_TRACING,
-       .expected_attach_type = BPF_TRACE_FENTRY,
-       .kfunc = "dentry_open",
-},
-{
-       "d_path reject",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_1, 0),
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_MOV64_IMM(BPF_REG_6, 0),
-       BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_6, 0),
-       BPF_LD_IMM64(BPF_REG_3, 8),
-       BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_d_path),
-       BPF_MOV64_IMM(BPF_REG_0, 0),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "helper call is not allowed in probe",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_TRACING,
-       .expected_attach_type = BPF_TRACE_FENTRY,
-       .kfunc = "d_path",
-},