selftests/bpf: verifier/value_illegal_alu converted to inline assembly

Test verifier/value_illegal_alu automatically converted to use inline assembly.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20230421174234.2391278-24-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 a2754ea..8695d39 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@ -60,6 +60,7 @@
 #include "verifier_unpriv_perf.skel.h"
 #include "verifier_value_adj_spill.skel.h"
 #include "verifier_value.skel.h"
+#include "verifier_value_illegal_alu.skel.h"
 #include "verifier_value_or_null.skel.h"
 #include "verifier_var_off.skel.h"
 #include "verifier_xadd.skel.h"
@@ -156,6 +157,7 @@ void test_verifier_unpriv(void)               { RUN(verifier_unpriv); }
 void test_verifier_unpriv_perf(void)          { RUN(verifier_unpriv_perf); }
 void test_verifier_value_adj_spill(void)      { RUN(verifier_value_adj_spill); }
 void test_verifier_value(void)                { RUN(verifier_value); }
+void test_verifier_value_illegal_alu(void)    { RUN(verifier_value_illegal_alu); }
 void test_verifier_value_or_null(void)        { RUN(verifier_value_or_null); }
 void test_verifier_var_off(void)              { RUN(verifier_var_off); }
 void test_verifier_xadd(void)                 { RUN(verifier_xadd); }

diff --git a/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
new file mode 100644 (file)
index 0000000..71814a7
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/value_illegal_alu.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("map element value illegal alu op, 1")
+__failure __msg("R0 bitwise operator &= on pointer")
+__failure_unpriv
+__naked void value_illegal_alu_op_1(void)
+{
+       asm volatile ("                                 \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = 0;                                         \
+       *(u64*)(r2 + 0) = r1;                           \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r0 &= 8;                                        \
+       r1 = 22;                                        \
+       *(u64*)(r0 + 0) = r1;                           \
+l0_%=: exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("map element value illegal alu op, 2")
+__failure __msg("R0 32-bit pointer arithmetic prohibited")
+__failure_unpriv
+__naked void value_illegal_alu_op_2(void)
+{
+       asm volatile ("                                 \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = 0;                                         \
+       *(u64*)(r2 + 0) = r1;                           \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       w0 += 0;                                        \
+       r1 = 22;                                        \
+       *(u64*)(r0 + 0) = r1;                           \
+l0_%=: exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("map element value illegal alu op, 3")
+__failure __msg("R0 pointer arithmetic with /= operator")
+__failure_unpriv
+__naked void value_illegal_alu_op_3(void)
+{
+       asm volatile ("                                 \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = 0;                                         \
+       *(u64*)(r2 + 0) = r1;                           \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r0 /= 42;                                       \
+       r1 = 22;                                        \
+       *(u64*)(r0 + 0) = r1;                           \
+l0_%=: exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("map element value illegal alu op, 4")
+__failure __msg("invalid mem access 'scalar'")
+__failure_unpriv __msg_unpriv("R0 pointer arithmetic prohibited")
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void value_illegal_alu_op_4(void)
+{
+       asm volatile ("                                 \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = 0;                                         \
+       *(u64*)(r2 + 0) = r1;                           \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r0 = be64 r0;                                   \
+       r1 = 22;                                        \
+       *(u64*)(r0 + 0) = r1;                           \
+l0_%=: exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+SEC("socket")
+__description("map element value illegal alu op, 5")
+__failure __msg("R0 invalid mem access 'scalar'")
+__msg_unpriv("leaking pointer from stack off -8")
+__flag(BPF_F_ANY_ALIGNMENT)
+__naked void value_illegal_alu_op_5(void)
+{
+       asm volatile ("                                 \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       r1 = 0;                                         \
+       *(u64*)(r2 + 0) = r1;                           \
+       r1 = %[map_hash_48b] ll;                        \
+       call %[bpf_map_lookup_elem];                    \
+       if r0 == 0 goto l0_%=;                          \
+       r3 = 4096;                                      \
+       r2 = r10;                                       \
+       r2 += -8;                                       \
+       *(u64*)(r2 + 0) = r0;                           \
+       lock *(u64 *)(r2 + 0) += r3;                    \
+       r0 = *(u64*)(r2 + 0);                           \
+       r1 = 22;                                        \
+       *(u64*)(r0 + 0) = r1;                           \
+l0_%=: exit;                                           \
+"      :
+       : __imm(bpf_map_lookup_elem),
+         __imm_addr(map_hash_48b)
+       : __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/verifier/value_illegal_alu.c b/tools/testing/selftests/bpf/verifier/value_illegal_alu.c
deleted file mode 100644 (file)
index d6f29eb..0000000
--- a/tools/testing/selftests/bpf/verifier/value_illegal_alu.c
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-       "map element value illegal alu op, 1",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),
-       BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr = "R0 bitwise operator &= on pointer",
-       .result = REJECT,
-},
-{
-       "map element value illegal alu op, 2",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),
-       BPF_ALU32_IMM(BPF_ADD, BPF_REG_0, 0),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr = "R0 32-bit pointer arithmetic prohibited",
-       .result = REJECT,
-},
-{
-       "map element value illegal alu op, 3",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),
-       BPF_ALU64_IMM(BPF_DIV, BPF_REG_0, 42),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr = "R0 pointer arithmetic with /= operator",
-       .result = REJECT,
-},
-{
-       "map element value illegal alu op, 4",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 2),
-       BPF_ENDIAN(BPF_FROM_BE, BPF_REG_0, 64),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr_unpriv = "R0 pointer arithmetic prohibited",
-       .errstr = "invalid mem access 'scalar'",
-       .result = REJECT,
-       .result_unpriv = REJECT,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},
-{
-       "map element value illegal alu op, 5",
-       .insns = {
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
-       BPF_LD_MAP_FD(BPF_REG_1, 0),
-       BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
-       BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 7),
-       BPF_MOV64_IMM(BPF_REG_3, 4096),
-       BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
-       BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
-       BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_0, 0),
-       BPF_ATOMIC_OP(BPF_DW, BPF_ADD, BPF_REG_2, BPF_REG_3, 0),
-       BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, 0),
-       BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
-       BPF_EXIT_INSN(),
-       },
-       .fixup_map_hash_48b = { 3 },
-       .errstr_unpriv = "leaking pointer from stack off -8",
-       .errstr = "R0 invalid mem access 'scalar'",
-       .result = REJECT,
-       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
-},