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

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

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230325025524.144043-13-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 46182ab..b138c98 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -9,6 +9,7 @@
 #include "verifier_bounds_deduction.skel.h"
 #include "verifier_bounds_mix_sign_unsign.skel.h"
 #include "verifier_cfg.skel.h"
+#include "verifier_cgroup_inv_retcode.skel.h"
 
 __maybe_unused
 static void run_tests_aux(const char *skel_name, skel_elf_bytes_fn elf_bytes_factory)
@@ -40,3 +41,4 @@ void test_verifier_basic_stack(void)          { RUN(verifier_basic_stack); }
 void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction); }
 void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }
 void test_verifier_cfg(void)                  { RUN(verifier_cfg); }
+void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c b/tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c
new file mode 100644 (file)
index 0000000..d6c4a7f
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test1")
+__failure __msg("R0 has value (0x0; 0xffffffff)")
+__naked void with_invalid_return_code_test1(void)
+{
+       asm volatile ("                                 \
+       r0 = *(u32*)(r1 + 0);                           \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test2")
+__success
+__naked void with_invalid_return_code_test2(void)
+{
+       asm volatile ("                                 \
+       r0 = *(u32*)(r1 + 0);                           \
+       r0 &= 1;                                        \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test3")
+__failure __msg("R0 has value (0x0; 0x3)")
+__naked void with_invalid_return_code_test3(void)
+{
+       asm volatile ("                                 \
+       r0 = *(u32*)(r1 + 0);                           \
+       r0 &= 3;                                        \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test4")
+__success
+__naked void with_invalid_return_code_test4(void)
+{
+       asm volatile ("                                 \
+       r0 = 1;                                         \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test5")
+__failure __msg("R0 has value (0x2; 0x0)")
+__naked void with_invalid_return_code_test5(void)
+{
+       asm volatile ("                                 \
+       r0 = 2;                                         \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test6")
+__failure __msg("R0 is not a known value (ctx)")
+__naked void with_invalid_return_code_test6(void)
+{
+       asm volatile ("                                 \
+       r0 = r1;                                        \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+SEC("cgroup/sock")
+__description("bpf_exit with invalid return code. test7")
+__failure __msg("R0 has unknown scalar value")
+__naked void with_invalid_return_code_test7(void)
+{
+       asm volatile ("                                 \
+       r0 = *(u32*)(r1 + 0);                           \
+       r2 = *(u32*)(r1 + 4);                           \
+       r0 *= r2;                                       \
+       exit;                                           \
+"      ::: __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c b/tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c
deleted file mode 100644 (file)
index 6d65fe3..0000000
--- a/tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-       "bpf_exit with invalid return code. test1",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, 0),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R0 has value (0x0; 0xffffffff)",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test2",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, 0),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test3",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, 0),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 3),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R0 has value (0x0; 0x3)",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test4",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_0, 1),
-       BPF_EXIT_INSN(),
-       },
-       .result = ACCEPT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test5",
-       .insns = {
-       BPF_MOV64_IMM(BPF_REG_0, 2),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R0 has value (0x2; 0x0)",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test6",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_0, BPF_REG_1),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R0 is not a known value (ctx)",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},
-{
-       "bpf_exit with invalid return code. test7",
-       .insns = {
-       BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1, 0),
-       BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 4),
-       BPF_ALU64_REG(BPF_MUL, BPF_REG_0, BPF_REG_2),
-       BPF_EXIT_INSN(),
-       },
-       .errstr = "R0 has unknown scalar value",
-       .result = REJECT,
-       .prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
-},