Skip to contentSkip to conversation

Second set of verifier/*.c migrated to inline assembly

PATCH In review Eduard Zingerman 3 participants 30 messages Apr 21, 2023

Subsystems (3)
lore
Share & tools
lore

Eduard Zingerman

author maintainer
#0 lore raw

cover Second set of verifier/*.c migrated to inline assembly

This is a follow up for RFC [1]. It migrates a second batch of 23 verifier/*.c tests to inline assembly and use of ./test_progs for actual execution. Link to the first batch is [2].

The migration is done by a python script (see [3]) with minimal manual adjustments.

Each migrated verifier/xxx.c file is mapped to progs/verifier_xxx.c plus an entry in the prog_tests/verifier.c. One patch per each file.

The first patch in a series adds a notion of auxiliary programs to test_loader. This is necessary to support tests that use BPF_MAP_TYPE_PROG_ARRAY maps. Programs marked as auxiliary are always loaded but are not treated as a separate tests.

The main differences compared to the previous batch:
- Tests that use pseudo call instruction are migrated, called functions are translated as below:

    static __naked __noinline __attribute__((used))
    void bounded_recursion__1(void)
    {
    	asm volatile (...);
    }

Pseudo call in the inline assembly looks as follows:

    __naked void bounded_recursion(void)
    {
        asm volatile ("                                 \
        r1 = 0;                                         \
        call bounded_recursion__1;                      \
        exit;                                           \
    "   ::: __clobber_all);
    }

Interestingly enough, callee declaration does not have to precede caller definition when used from inline assembly.

- Tests that specify .expected_attach_type are migrated using corresponding SEC annotations. For example, the following test specification:

    {
            "reference tracking: ...",
            .insns = { ... },
            .prog_type = BPF_PROG_TYPE_LSM,
            .kfunc = "bpf",
            .expected_attach_type = BPF_LSM_MAC,
            .flags = BPF_F_SLEEPABLE,
            ...
    },

Becomes:

    SEC("lsm.s/bpf")
    __description("reference tracking: ...")
    __success
    __naked void acquire_release_user_key_reference(void) { ... }

- Tests that use BPF_MAP_TYPE_PROG_ARRAY are migrated, the definitions of map and dummy programs that populate it are repeated in each test.

There __imm_insn macro had to be used in a few tests because of the limitations of clang BPF inline assembler:
- For BPF_ST_MEM instruction in verifier_precise.c and verifier_unpriv.c;
- For BPF_LD_IND with three arguments in verifier_ref_tracking.c.

Migrated tests could be selected for execution using the following filter:

./test_progs -a verifier_*

While reviewing the changes I noticed the following irregularities in the original tests:
- verifier_sock.c:
Tests "bpf_sk_select_reuseport(ctx, sockhash, &key, flags)"
and "bpf_sk_select_reuseport(ctx, sockmap, &key, flags)"
have identical bodies.
- unpriv.c:
Despite the name of the file, 12 tests defined in it have program types that are not considered for unprivileged execution by test_verifier (e.g. BPF_PROG_TYPE_TRACEPOINT).

Modifications were applied for the following tests:
- loop1.c:

Some of the tests have .retval field specified, but program type is BPF_PROG_TYPE_TRACEPOINT, which does not support BPF_PROG_TEST_RUN command, for these tests
- either program type is changed to "xdp", which supports

    BPF_PROG_TEST_RUN;

- or retval tag is removed, if test run result is not actually predictable (e.g. depends on bpf_get_prandom_u32()).
- unpriv.c:
This file is split in two parts:
- progs/verifier_unpriv.c
- progs/verifier_unpriv_perf.c
First part requires inclusion of filter.h,
second part requires inclusion of vmlinux.h.
- value_ptr_arith.c:
"sanitation: alu with different scalars 2" and "sanitation: alu with different scalars 3"
are modified to avoid retval "-EINVAL * 2" which cannot be encoded as a type tag.

Additional details are in the relevant commit messages.

[1] RFC

    https://lore.kernel.org/bpf/[email protected]/
[2] First batch of migrated tests
    https://lore.kernel.org/bpf/[email protected]/

[3] Migration tool
https://github.com/eddyz87/verifier-tests-migrator

Eduard Zingerman (24):
selftests/bpf: Add notion of auxiliary programs for test_loader selftests/bpf: verifier/bounds converted to inline assembly selftests/bpf: verifier/bpf_get_stack converted to inline assembly selftests/bpf: verifier/btf_ctx_access converted to inline assembly selftests/bpf: verifier/ctx converted to inline assembly selftests/bpf: verifier/d_path converted to inline assembly selftests/bpf: verifier/direct_packet_access converted to inline
assembly
selftests/bpf: verifier/jeq_infer_not_null converted to inline
assembly
selftests/bpf: verifier/loops1 converted to inline assembly selftests/bpf: verifier/lwt converted to inline assembly selftests/bpf: verifier/map_in_map converted to inline assembly selftests/bpf: verifier/map_ptr_mixing converted to inline assembly selftests/bpf: verifier/precise converted to inline assembly selftests/bpf: verifier/prevent_map_lookup converted to inline
assembly
selftests/bpf: verifier/ref_tracking converted to inline assembly selftests/bpf: verifier/regalloc converted to inline assembly selftests/bpf: verifier/runtime_jit converted to inline assembly selftests/bpf: verifier/search_pruning converted to inline assembly selftests/bpf: verifier/sock converted to inline assembly selftests/bpf: verifier/spin_lock converted to inline assembly selftests/bpf: verifier/subreg converted to inline assembly selftests/bpf: verifier/unpriv converted to inline assembly selftests/bpf: verifier/value_illegal_alu converted to inline assembly selftests/bpf: verifier/value_ptr_arith converted to inline assembly

 .../selftests/bpf/prog_tests/verifier.c       |   80 +-
 tools/testing/selftests/bpf/progs/bpf_misc.h  |    6 +
 .../selftests/bpf/progs/verifier_bounds.c     | 1076 ++++++++++++
 .../bpf/progs/verifier_bpf_get_stack.c        |  124 ++
 .../bpf/progs/verifier_btf_ctx_access.c       |   32 +
 .../selftests/bpf/progs/verifier_ctx.c        |  221 +++
 .../selftests/bpf/progs/verifier_d_path.c     |   48 +
 .../bpf/progs/verifier_direct_packet_access.c |  803 +++++++++
 .../bpf/progs/verifier_jeq_infer_not_null.c   |  213 +++
 .../selftests/bpf/progs/verifier_loops1.c     |  259 +++
 .../selftests/bpf/progs/verifier_lwt.c        |  234 +++
 .../selftests/bpf/progs/verifier_map_in_map.c |  142 ++
 .../bpf/progs/verifier_map_ptr_mixing.c       |  265 +++
 .../selftests/bpf/progs/verifier_precise.c    |  269 +++
 .../bpf/progs/verifier_prevent_map_lookup.c   |   65 +
 .../bpf/progs/verifier_ref_tracking.c         | 1495 +++++++++++++++++
 .../selftests/bpf/progs/verifier_regalloc.c   |  364 ++++
 .../bpf/progs/verifier_runtime_jit.c          |  360 ++++
 .../bpf/progs/verifier_search_pruning.c       |  339 ++++
 .../selftests/bpf/progs/verifier_sock.c       |  980 +++++++++++
 .../selftests/bpf/progs/verifier_spin_lock.c  |  533 ++++++
 .../selftests/bpf/progs/verifier_subreg.c     |  673 ++++++++
 .../selftests/bpf/progs/verifier_unpriv.c     |  726 ++++++++
 .../bpf/progs/verifier_unpriv_perf.c          |   34 +
 .../bpf/progs/verifier_value_illegal_alu.c    |  149 ++
 .../bpf/progs/verifier_value_ptr_arith.c      | 1423 ++++++++++++++++
 tools/testing/selftests/bpf/test_loader.c     |   89 +-
 tools/testing/selftests/bpf/verifier/bounds.c |  884 ----------
 .../selftests/bpf/verifier/bpf_get_stack.c    |   87 -
 .../selftests/bpf/verifier/btf_ctx_access.c   |   25 -
 tools/testing/selftests/bpf/verifier/ctx.c    |  186 --
 tools/testing/selftests/bpf/verifier/d_path.c |   37 -
 .../bpf/verifier/direct_packet_access.c       |  710 --------
 .../bpf/verifier/jeq_infer_not_null.c         |  174 --
 tools/testing/selftests/bpf/verifier/loops1.c |  206 ---
 tools/testing/selftests/bpf/verifier/lwt.c    |  189 ---
 .../selftests/bpf/verifier/map_in_map.c       |   96 --
 .../selftests/bpf/verifier/map_ptr_mixing.c   |  100 --
 .../testing/selftests/bpf/verifier/precise.c  |  219 ---
 .../bpf/verifier/prevent_map_lookup.c         |   29 -
 .../selftests/bpf/verifier/ref_tracking.c     | 1082 ------------
 .../testing/selftests/bpf/verifier/regalloc.c |  277 ---
 .../selftests/bpf/verifier/runtime_jit.c      |  231 ---
 .../selftests/bpf/verifier/search_pruning.c   |  266 ---
 tools/testing/selftests/bpf/verifier/sock.c   |  706 --------
 .../selftests/bpf/verifier/spin_lock.c        |  447 -----
 tools/testing/selftests/bpf/verifier/subreg.c |  533 ------
 tools/testing/selftests/bpf/verifier/unpriv.c |  562 -------
 .../bpf/verifier/value_illegal_alu.c          |   95 --
 .../selftests/bpf/verifier/value_ptr_arith.c  | 1140 -------------
 50 files changed, 10974 insertions(+), 8309 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_bpf_get_stack.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_d_path.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_jeq_infer_not_null.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_loops1.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_lwt.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_in_map.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_precise.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_prevent_map_lookup.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_ref_tracking.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_regalloc.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_runtime_jit.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_search_pruning.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_spin_lock.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_subreg.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv_perf.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/bounds.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/btf_ctx_access.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/ctx.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/d_path.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/jeq_infer_not_null.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/loops1.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/lwt.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/precise.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/regalloc.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/sock.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/spin_lock.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/subreg.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c
Signature · 1 line
2.40.0
author maintainer
#1 lore raw

PATCH 1/24 selftests/bpf: Add notion of auxiliary programs for test_loader

In order to express test cases that use bpf_tail_call() intrinsic it is necessary to have several programs to be loaded at a time. This commit adds __auxiliary annotation to the set of annotations supported by test_loader.c. Programs marked as auxiliary are always loaded but are not treated as a separate test.

For example:

    void dummy_prog1(void);

    struct {
            __uint(type, BPF_MAP_TYPE_PROG_ARRAY);
            __uint(max_entries, 4);
            __uint(key_size, sizeof(int));
            __array(values, void (void));
    } prog_map SEC(".maps") = {
            .values = {
                    [0] = (void *) &dummy_prog1,
            },
    };

    SEC("tc")
    __auxiliary
    __naked void dummy_prog1(void) {
            asm volatile ("r0 = 42; exit;");
    }

    SEC("tc")
    __description("reference tracking: check reference or tail call")
    __success __retval(0)
    __naked void check_reference_or_tail_call(void)
    {
            asm volatile (
            "r2 = %[prog_map] ll;"
            "r3 = 0;"
            "call %[bpf_tail_call];"
            "r0 = 0;"
            "exit;"
            :: __imm(bpf_tail_call),
            :  __clobber_all);
    }
---
 tools/testing/selftests/bpf/progs/bpf_misc.h |  6 ++
 tools/testing/selftests/bpf/test_loader.c    | 89 +++++++++++++++-----
 2 files changed, 73 insertions(+), 22 deletions(-)
tools/testing/selftests/bpf/progs/bpf_misc.h +6 -0
index 3b307de8dab9..d3c1217ba79a 100644
@@ -53,6 +53,10 @@
  *                   - A numeric value.
  *                   Multiple __flag attributes could be specified, the final flags
  *                   value is derived by applying binary "or" to all specified values.
+ *
+ * __auxiliary         Annotated program is not a separate test, but used as auxiliary
+ *                     for some other test cases and should always be loaded.
+ * __auxiliary_unpriv  Same, but load program in unprivileged mode.
  */
 #define __msg(msg)		__attribute__((btf_decl_tag("comment:test_expect_msg=" msg)))
 #define __failure		__attribute__((btf_decl_tag("comment:test_expect_failure")))
@@ -65,6 +69,8 @@
 #define __flag(flag)		__attribute__((btf_decl_tag("comment:test_prog_flags="#flag)))
 #define __retval(val)		__attribute__((btf_decl_tag("comment:test_retval="#val)))
 #define __retval_unpriv(val)	__attribute__((btf_decl_tag("comment:test_retval_unpriv="#val)))
+#define __auxiliary		__attribute__((btf_decl_tag("comment:test_auxiliary")))
+#define __auxiliary_unpriv	__attribute__((btf_decl_tag("comment:test_auxiliary_unpriv")))
 
 /* Convenience macro for use with 'asm volatile' blocks */
 #define __naked __attribute__((naked))
tools/testing/selftests/bpf/test_loader.c +67 -22

164 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#2 lore raw

PATCH 2/24 selftests/bpf: verifier/bounds converted to inline assembly

In reply to Eduard Zingerman

Test verifier/bounds automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |    2 +
 .../selftests/bpf/progs/verifier_bounds.c     | 1076 +++++++++++++++++
 tools/testing/selftests/bpf/verifier/bounds.c |  884 --------------
 3 files changed, 1078 insertions(+), 884 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/bounds.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 7c68d78da9ea..e61c9120e261 100644
@@ -6,6 +6,7 @@
 #include "verifier_and.skel.h"
 #include "verifier_array_access.skel.h"
 #include "verifier_basic_stack.skel.h"
+#include "verifier_bounds.skel.h"
 #include "verifier_bounds_deduction.skel.h"
 #include "verifier_bounds_deduction_non_const.skel.h"
 #include "verifier_bounds_mix_sign_unsign.skel.h"
@@ -80,6 +81,7 @@ static void run_tests_aux(const char *skel_name,
 
 void test_verifier_and(void)                  { RUN(verifier_and); }
 void test_verifier_basic_stack(void)          { RUN(verifier_basic_stack); }
+void test_verifier_bounds(void)               { RUN(verifier_bounds); }
 void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction); }
 void test_verifier_bounds_deduction_non_const(void)     { RUN(verifier_bounds_deduction_non_const); }
 void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }
tools/testing/selftests/bpf/progs/verifier_bounds.c new file +1076 -0

1,076 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/bounds.c deleted +0 -884

884 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#3 lore raw

PATCH 3/24 selftests/bpf: verifier/bpf_get_stack converted to inline assembly

In reply to Eduard Zingerman

Test verifier/bpf_get_stack automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_bpf_get_stack.c        | 124 ++++++++++++++++++
 .../selftests/bpf/verifier/bpf_get_stack.c    |  87 ------------
 3 files changed, 126 insertions(+), 87 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_bpf_get_stack.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/bpf_get_stack.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index e61c9120e261..db55d125928c 100644
@@ -10,6 +10,7 @@
 #include "verifier_bounds_deduction.skel.h"
 #include "verifier_bounds_deduction_non_const.skel.h"
 #include "verifier_bounds_mix_sign_unsign.skel.h"
+#include "verifier_bpf_get_stack.skel.h"
 #include "verifier_cfg.skel.h"
 #include "verifier_cgroup_inv_retcode.skel.h"
 #include "verifier_cgroup_skb.skel.h"
@@ -85,6 +86,7 @@ void test_verifier_bounds(void)               { RUN(verifier_bounds); }
 void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction); }
 void test_verifier_bounds_deduction_non_const(void)     { RUN(verifier_bounds_deduction_non_const); }
 void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }
+void test_verifier_bpf_get_stack(void)        { RUN(verifier_bpf_get_stack); }
 void test_verifier_cfg(void)                  { RUN(verifier_cfg); }
 void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode); }
 void test_verifier_cgroup_skb(void)           { RUN(verifier_cgroup_skb); }
tools/testing/selftests/bpf/progs/verifier_bpf_get_stack.c new file +124 -0

124 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/bpf_get_stack.c deleted +0 -87

87 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#4 lore raw

PATCH 4/24 selftests/bpf: verifier/btf_ctx_access converted to inline assembly

In reply to Eduard Zingerman

Test verifier/btf_ctx_access automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |  2 ++
 .../bpf/progs/verifier_btf_ctx_access.c       | 32 +++++++++++++++++++
 .../selftests/bpf/verifier/btf_ctx_access.c   | 25 ---------------
 3 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/btf_ctx_access.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index db55d125928c..b42601f7edcb 100644
@@ -11,6 +11,7 @@
 #include "verifier_bounds_deduction_non_const.skel.h"
 #include "verifier_bounds_mix_sign_unsign.skel.h"
 #include "verifier_bpf_get_stack.skel.h"
+#include "verifier_btf_ctx_access.skel.h"
 #include "verifier_cfg.skel.h"
 #include "verifier_cgroup_inv_retcode.skel.h"
 #include "verifier_cgroup_skb.skel.h"
@@ -87,6 +88,7 @@ void test_verifier_bounds_deduction(void)     { RUN(verifier_bounds_deduction);
 void test_verifier_bounds_deduction_non_const(void)     { RUN(verifier_bounds_deduction_non_const); }
 void test_verifier_bounds_mix_sign_unsign(void) { RUN(verifier_bounds_mix_sign_unsign); }
 void test_verifier_bpf_get_stack(void)        { RUN(verifier_bpf_get_stack); }
+void test_verifier_btf_ctx_access(void)       { RUN(verifier_btf_ctx_access); }
 void test_verifier_cfg(void)                  { RUN(verifier_cfg); }
 void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode); }
 void test_verifier_cgroup_skb(void)           { RUN(verifier_cgroup_skb); }
tools/testing/selftests/bpf/progs/verifier_btf_ctx_access.c new file +32 -0
new file mode 100644
index 000000000000..a570e48b917a
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/btf_ctx_access.c */
+
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+SEC("fentry/bpf_modify_return_test")
+__description("btf_ctx_access accept")
+__success __retval(0)
+__naked void btf_ctx_access_accept(void)
+{
+	asm volatile ("					\
+	r2 = *(u32*)(r1 + 8);		/* load 2nd argument value (int pointer) */\
+	r0 = 0;						\
+	exit;						\
+"	::: __clobber_all);
+}
+
+SEC("fentry/bpf_fentry_test9")
+__description("btf_ctx_access u32 pointer accept")
+__success __retval(0)
+__naked void ctx_access_u32_pointer_accept(void)
+{
+	asm volatile ("					\
+	r2 = *(u32*)(r1 + 0);		/* load 1nd argument value (u32 pointer) */\
+	r0 = 0;						\
+	exit;						\
+"	::: __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/verifier/btf_ctx_access.c deleted +0 -25
deleted file mode 100644
index 0484d3de040d..000000000000
@@ -1,25 +0,0 @@
-{
-	"btf_ctx_access accept",
-	.insns = {
-	BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 8),	/* load 2nd argument value (int pointer) */
-	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 = "bpf_modify_return_test",
-},
-
-{
-	"btf_ctx_access u32 pointer accept",
-	.insns = {
-	BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 0),	/* load 1nd argument value (u32 pointer) */
-	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 = "bpf_fentry_test9",
-},
Signature · 1 line
2.40.0
author maintainer
#5 lore raw

PATCH 5/24 selftests/bpf: verifier/ctx converted to inline assembly

In reply to Eduard Zingerman

Test verifier/ctx automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_ctx.c        | 221 ++++++++++++++++++
 tools/testing/selftests/bpf/verifier/ctx.c    | 186 ---------------
 3 files changed, 223 insertions(+), 186 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/ctx.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index b42601f7edcb..f559bc3f7c2f 100644
@@ -17,6 +17,7 @@
 #include "verifier_cgroup_skb.skel.h"
 #include "verifier_cgroup_storage.skel.h"
 #include "verifier_const_or.skel.h"
+#include "verifier_ctx.skel.h"
 #include "verifier_ctx_sk_msg.skel.h"
 #include "verifier_direct_stack_access_wraparound.skel.h"
 #include "verifier_div0.skel.h"
@@ -94,6 +95,7 @@ void test_verifier_cgroup_inv_retcode(void)   { RUN(verifier_cgroup_inv_retcode)
 void test_verifier_cgroup_skb(void)           { RUN(verifier_cgroup_skb); }
 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_direct_stack_access_wraparound(void) { RUN(verifier_direct_stack_access_wraparound); }
 void test_verifier_div0(void)                 { RUN(verifier_div0); }
tools/testing/selftests/bpf/progs/verifier_ctx.c new file +221 -0

221 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/ctx.c deleted +0 -186

186 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#6 lore raw

PATCH 6/24 selftests/bpf: verifier/d_path converted to inline assembly

In reply to Eduard Zingerman

Test verifier/d_path automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |  2 +
 .../selftests/bpf/progs/verifier_d_path.c     | 48 +++++++++++++++++++
 tools/testing/selftests/bpf/verifier/d_path.c | 37 --------------
 3 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_d_path.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/d_path.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index f559bc3f7c2f..ae4da5f7598c 100644
@@ -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"
@@ -97,6 +98,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); }
tools/testing/selftests/bpf/progs/verifier_d_path.c new file +48 -0

48 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/d_path.c deleted +0 -37
deleted file mode 100644
index b988396379a7..000000000000
@@ -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",
-},
Signature · 1 line
2.40.0
author maintainer
#7 lore raw

PATCH 7/24 selftests/bpf: verifier/direct_packet_access converted to inline assembly

In reply to Eduard Zingerman

Test verifier/direct_packet_access automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_direct_packet_access.c | 803 ++++++++++++++++++
 .../bpf/verifier/direct_packet_access.c       | 710 ----------------
 3 files changed, 805 insertions(+), 710 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/direct_packet_access.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index ae4da5f7598c..2c9e61b9a83e 100644
@@ -20,6 +20,7 @@
 #include "verifier_ctx.skel.h"
 #include "verifier_ctx_sk_msg.skel.h"
 #include "verifier_d_path.skel.h"
+#include "verifier_direct_packet_access.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_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_packet_access(void) { RUN(verifier_direct_packet_access); }
 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); }
tools/testing/selftests/bpf/progs/verifier_direct_packet_access.c new file +803 -0

803 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/direct_packet_access.c deleted +0 -710

710 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#8 lore raw

PATCH 8/24 selftests/bpf: verifier/jeq_infer_not_null converted to inline assembly

In reply to Eduard Zingerman

Test verifier/jeq_infer_not_null automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_jeq_infer_not_null.c   | 213 ++++++++++++++++++
 .../bpf/verifier/jeq_infer_not_null.c         | 174 --------------
 3 files changed, 215 insertions(+), 174 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_jeq_infer_not_null.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/jeq_infer_not_null.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 2c9e61b9a83e..de5db0de98a1 100644
@@ -29,6 +29,7 @@
 #include "verifier_helper_restricted.skel.h"
 #include "verifier_helper_value_access.skel.h"
 #include "verifier_int_ptr.skel.h"
+#include "verifier_jeq_infer_not_null.skel.h"
 #include "verifier_ld_ind.skel.h"
 #include "verifier_leak_ptr.skel.h"
 #include "verifier_map_ptr.skel.h"
@@ -109,6 +110,7 @@ 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_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }
 void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
 void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }
 void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }
tools/testing/selftests/bpf/progs/verifier_jeq_infer_not_null.c new file +213 -0

213 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/jeq_infer_not_null.c deleted +0 -174

174 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#9 lore raw

PATCH 9/24 selftests/bpf: verifier/loops1 converted to inline assembly

In reply to Eduard Zingerman

Test verifier/loops1 automatically converted to use inline assembly.

There are a few modifications for the converted tests. "tracepoint" programs do not support test execution, change program type to "xdp" (which supports test execution) for the following tests that have __retval tags:
- bounded loop, count to 4
- bonded loop containing forward jump

Also, remove the __retval tag for test:
- bounded loop, count from positive unknown to 4

As it's return value is a random number.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_loops1.c     | 259 ++++++++++++++++++
 tools/testing/selftests/bpf/verifier/loops1.c | 206 --------------
 3 files changed, 261 insertions(+), 206 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_loops1.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/loops1.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index de5db0de98a1..33a50dbc2321 100644
@@ -32,6 +32,7 @@
 #include "verifier_jeq_infer_not_null.skel.h"
 #include "verifier_ld_ind.skel.h"
 #include "verifier_leak_ptr.skel.h"
+#include "verifier_loops1.skel.h"
 #include "verifier_map_ptr.skel.h"
 #include "verifier_map_ret_val.skel.h"
 #include "verifier_masking.skel.h"
@@ -113,6 +114,7 @@ void test_verifier_int_ptr(void)              { RUN(verifier_int_ptr); }
 void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }
 void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
 void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }
+void test_verifier_loops1(void)               { RUN(verifier_loops1); }
 void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }
 void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
tools/testing/selftests/bpf/progs/verifier_loops1.c new file +259 -0

259 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/loops1.c deleted +0 -206

206 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#10 lore raw

PATCH 10/24 selftests/bpf: verifier/lwt converted to inline assembly

In reply to Eduard Zingerman

Test verifier/lwt automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_lwt.c        | 234 ++++++++++++++++++
 tools/testing/selftests/bpf/verifier/lwt.c    | 189 --------------
 3 files changed, 236 insertions(+), 189 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_lwt.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/lwt.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 33a50dbc2321..54c30fe1b693 100644
@@ -33,6 +33,7 @@
 #include "verifier_ld_ind.skel.h"
 #include "verifier_leak_ptr.skel.h"
 #include "verifier_loops1.skel.h"
+#include "verifier_lwt.skel.h"
 #include "verifier_map_ptr.skel.h"
 #include "verifier_map_ret_val.skel.h"
 #include "verifier_masking.skel.h"
@@ -115,6 +116,7 @@ void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null)
 void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
 void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }
 void test_verifier_loops1(void)               { RUN(verifier_loops1); }
+void test_verifier_lwt(void)                  { RUN(verifier_lwt); }
 void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }
 void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
tools/testing/selftests/bpf/progs/verifier_lwt.c new file +234 -0

234 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/lwt.c deleted +0 -189

189 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#11 lore raw

PATCH 11/24 selftests/bpf: verifier/map_in_map converted to inline assembly

In reply to Eduard Zingerman

Test verifier/map_in_map automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_map_in_map.c | 142 ++++++++++++++++++
 .../selftests/bpf/verifier/map_in_map.c       |  96 ------------
 3 files changed, 144 insertions(+), 96 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_in_map.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/map_in_map.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 54c30fe1b693..95fc9cb231ad 100644
@@ -34,6 +34,7 @@
 #include "verifier_leak_ptr.skel.h"
 #include "verifier_loops1.skel.h"
 #include "verifier_lwt.skel.h"
+#include "verifier_map_in_map.skel.h"
 #include "verifier_map_ptr.skel.h"
 #include "verifier_map_ret_val.skel.h"
 #include "verifier_masking.skel.h"
@@ -117,6 +118,7 @@ void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
 void test_verifier_leak_ptr(void)             { RUN(verifier_leak_ptr); }
 void test_verifier_loops1(void)               { RUN(verifier_loops1); }
 void test_verifier_lwt(void)                  { RUN(verifier_lwt); }
+void test_verifier_map_in_map(void)           { RUN(verifier_map_in_map); }
 void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }
 void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
tools/testing/selftests/bpf/progs/verifier_map_in_map.c new file +142 -0

142 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/map_in_map.c deleted +0 -96

96 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#12 lore raw

PATCH 12/24 selftests/bpf: verifier/map_ptr_mixing converted to inline assembly

In reply to Eduard Zingerman

Test verifier/map_ptr_mixing automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_map_ptr_mixing.c       | 265 ++++++++++++++++++
 .../selftests/bpf/verifier/map_ptr_mixing.c   | 100 -------
 3 files changed, 267 insertions(+), 100 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/map_ptr_mixing.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 95fc9cb231ad..261567230dd0 100644
@@ -36,6 +36,7 @@
 #include "verifier_lwt.skel.h"
 #include "verifier_map_in_map.skel.h"
 #include "verifier_map_ptr.skel.h"
+#include "verifier_map_ptr_mixing.skel.h"
 #include "verifier_map_ret_val.skel.h"
 #include "verifier_masking.skel.h"
 #include "verifier_meta_access.skel.h"
@@ -120,6 +121,7 @@ void test_verifier_loops1(void)               { RUN(verifier_loops1); }
 void test_verifier_lwt(void)                  { RUN(verifier_lwt); }
 void test_verifier_map_in_map(void)           { RUN(verifier_map_in_map); }
 void test_verifier_map_ptr(void)              { RUN(verifier_map_ptr); }
+void test_verifier_map_ptr_mixing(void)       { RUN(verifier_map_ptr_mixing); }
 void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
 void test_verifier_meta_access(void)          { RUN(verifier_meta_access); }
tools/testing/selftests/bpf/progs/verifier_map_ptr_mixing.c new file +265 -0

265 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/map_ptr_mixing.c deleted +0 -100

100 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#13 lore raw

PATCH 13/24 selftests/bpf: verifier/precise converted to inline assembly

In reply to Eduard Zingerman

Test verifier/precise automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_precise.c    | 269 ++++++++++++++++++
 .../testing/selftests/bpf/verifier/precise.c  | 219 --------------
 3 files changed, 271 insertions(+), 219 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_precise.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/precise.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 261567230dd0..d5ec9054c025 100644
@@ -40,6 +40,7 @@
 #include "verifier_map_ret_val.skel.h"
 #include "verifier_masking.skel.h"
 #include "verifier_meta_access.skel.h"
+#include "verifier_precise.skel.h"
 #include "verifier_raw_stack.skel.h"
 #include "verifier_raw_tp_writable.skel.h"
 #include "verifier_reg_equal.skel.h"
@@ -125,6 +126,7 @@ void test_verifier_map_ptr_mixing(void)       { RUN(verifier_map_ptr_mixing); }
 void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
 void test_verifier_meta_access(void)          { RUN(verifier_meta_access); }
+void test_verifier_precise(void)              { RUN(verifier_precise); }
 void test_verifier_raw_stack(void)            { RUN(verifier_raw_stack); }
 void test_verifier_raw_tp_writable(void)      { RUN(verifier_raw_tp_writable); }
 void test_verifier_reg_equal(void)            { RUN(verifier_reg_equal); }
tools/testing/selftests/bpf/progs/verifier_precise.c new file +269 -0

269 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/precise.c deleted +0 -219

219 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#14 lore raw

PATCH 14/24 selftests/bpf: verifier/prevent_map_lookup converted to inline assembly

In reply to Eduard Zingerman

Test verifier/prevent_map_lookup automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |  2 +
 .../bpf/progs/verifier_prevent_map_lookup.c   | 65 +++++++++++++++++++
 .../bpf/verifier/prevent_map_lookup.c         | 29 ---------
 3 files changed, 67 insertions(+), 29 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_prevent_map_lookup.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/prevent_map_lookup.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index d5ec9054c025..7627893dd849 100644
@@ -41,6 +41,7 @@
 #include "verifier_masking.skel.h"
 #include "verifier_meta_access.skel.h"
 #include "verifier_precise.skel.h"
+#include "verifier_prevent_map_lookup.skel.h"
 #include "verifier_raw_stack.skel.h"
 #include "verifier_raw_tp_writable.skel.h"
 #include "verifier_reg_equal.skel.h"
@@ -127,6 +128,7 @@ void test_verifier_map_ret_val(void)          { RUN(verifier_map_ret_val); }
 void test_verifier_masking(void)              { RUN(verifier_masking); }
 void test_verifier_meta_access(void)          { RUN(verifier_meta_access); }
 void test_verifier_precise(void)              { RUN(verifier_precise); }
+void test_verifier_prevent_map_lookup(void)   { RUN(verifier_prevent_map_lookup); }
 void test_verifier_raw_stack(void)            { RUN(verifier_raw_stack); }
 void test_verifier_raw_tp_writable(void)      { RUN(verifier_raw_tp_writable); }
 void test_verifier_reg_equal(void)            { RUN(verifier_reg_equal); }
tools/testing/selftests/bpf/progs/verifier_prevent_map_lookup.c new file +65 -0

65 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/prevent_map_lookup.c deleted +0 -29
deleted file mode 100644
index fc4e301260f6..000000000000
@@ -1,29 +0,0 @@
-{
-	"prevent map lookup in stack trace",
-	.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_EXIT_INSN(),
-	},
-	.fixup_map_stacktrace = { 3 },
-	.result = REJECT,
-	.errstr = "cannot pass map_type 7 into func bpf_map_lookup_elem",
-	.prog_type = BPF_PROG_TYPE_PERF_EVENT,
-},
-{
-	"prevent map lookup in prog array",
-	.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_EXIT_INSN(),
-	},
-	.fixup_prog2 = { 3 },
-	.result = REJECT,
-	.errstr = "cannot pass map_type 3 into func bpf_map_lookup_elem",
-},
Signature · 1 line
2.40.0
author maintainer
#15 lore raw

PATCH 15/24 selftests/bpf: verifier/ref_tracking converted to inline assembly

In reply to Eduard Zingerman

Test verifier/ref_tracking automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |    2 +
 .../bpf/progs/verifier_ref_tracking.c         | 1495 +++++++++++++++++
 .../selftests/bpf/verifier/ref_tracking.c     | 1082 ------------
 3 files changed, 1497 insertions(+), 1082 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_ref_tracking.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/ref_tracking.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 7627893dd849..5941ef59ed76 100644
@@ -45,6 +45,7 @@
 #include "verifier_raw_stack.skel.h"
 #include "verifier_raw_tp_writable.skel.h"
 #include "verifier_reg_equal.skel.h"
+#include "verifier_ref_tracking.skel.h"
 #include "verifier_ringbuf.skel.h"
 #include "verifier_spill_fill.skel.h"
 #include "verifier_stack_ptr.skel.h"
@@ -132,6 +133,7 @@ void test_verifier_prevent_map_lookup(void)   { RUN(verifier_prevent_map_lookup)
 void test_verifier_raw_stack(void)            { RUN(verifier_raw_stack); }
 void test_verifier_raw_tp_writable(void)      { RUN(verifier_raw_tp_writable); }
 void test_verifier_reg_equal(void)            { RUN(verifier_reg_equal); }
+void test_verifier_ref_tracking(void)         { RUN(verifier_ref_tracking); }
 void test_verifier_ringbuf(void)              { RUN(verifier_ringbuf); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
tools/testing/selftests/bpf/progs/verifier_ref_tracking.c new file +1495 -0

1,495 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/ref_tracking.c deleted +0 -1082

1,082 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#16 lore raw

PATCH 16/24 selftests/bpf: verifier/regalloc converted to inline assembly

In reply to Eduard Zingerman

Test verifier/regalloc automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_regalloc.c   | 364 ++++++++++++++++++
 .../testing/selftests/bpf/verifier/regalloc.c | 277 -------------
 3 files changed, 366 insertions(+), 277 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_regalloc.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/regalloc.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 5941ef59ed76..f0b9b74c43d7 100644
@@ -46,6 +46,7 @@
 #include "verifier_raw_tp_writable.skel.h"
 #include "verifier_reg_equal.skel.h"
 #include "verifier_ref_tracking.skel.h"
+#include "verifier_regalloc.skel.h"
 #include "verifier_ringbuf.skel.h"
 #include "verifier_spill_fill.skel.h"
 #include "verifier_stack_ptr.skel.h"
@@ -134,6 +135,7 @@ void test_verifier_raw_stack(void)            { RUN(verifier_raw_stack); }
 void test_verifier_raw_tp_writable(void)      { RUN(verifier_raw_tp_writable); }
 void test_verifier_reg_equal(void)            { RUN(verifier_reg_equal); }
 void test_verifier_ref_tracking(void)         { RUN(verifier_ref_tracking); }
+void test_verifier_regalloc(void)             { RUN(verifier_regalloc); }
 void test_verifier_ringbuf(void)              { RUN(verifier_ringbuf); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
tools/testing/selftests/bpf/progs/verifier_regalloc.c new file +364 -0

364 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/regalloc.c deleted +0 -277

277 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#17 lore raw

PATCH 17/24 selftests/bpf: verifier/runtime_jit converted to inline assembly

In reply to Eduard Zingerman

Test verifier/runtime_jit automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_runtime_jit.c          | 360 ++++++++++++++++++
 .../selftests/bpf/verifier/runtime_jit.c      | 231 -----------
 3 files changed, 362 insertions(+), 231 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_runtime_jit.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/runtime_jit.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index f0b9b74c43d7..072b0eb47391 100644
@@ -48,6 +48,7 @@
 #include "verifier_ref_tracking.skel.h"
 #include "verifier_regalloc.skel.h"
 #include "verifier_ringbuf.skel.h"
+#include "verifier_runtime_jit.skel.h"
 #include "verifier_spill_fill.skel.h"
 #include "verifier_stack_ptr.skel.h"
 #include "verifier_uninit.skel.h"
@@ -137,6 +138,7 @@ void test_verifier_reg_equal(void)            { RUN(verifier_reg_equal); }
 void test_verifier_ref_tracking(void)         { RUN(verifier_ref_tracking); }
 void test_verifier_regalloc(void)             { RUN(verifier_regalloc); }
 void test_verifier_ringbuf(void)              { RUN(verifier_ringbuf); }
+void test_verifier_runtime_jit(void)          { RUN(verifier_runtime_jit); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
tools/testing/selftests/bpf/progs/verifier_runtime_jit.c new file +360 -0

360 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/runtime_jit.c deleted +0 -231

231 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#18 lore raw

PATCH 18/24 selftests/bpf: verifier/search_pruning converted to inline assembly

In reply to Eduard Zingerman

Test verifier/search_pruning automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_search_pruning.c       | 339 ++++++++++++++++++
 .../selftests/bpf/verifier/search_pruning.c   | 266 --------------
 3 files changed, 341 insertions(+), 266 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_search_pruning.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/search_pruning.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 072b0eb47391..1ef44e699e9c 100644
@@ -49,6 +49,7 @@
 #include "verifier_regalloc.skel.h"
 #include "verifier_ringbuf.skel.h"
 #include "verifier_runtime_jit.skel.h"
+#include "verifier_search_pruning.skel.h"
 #include "verifier_spill_fill.skel.h"
 #include "verifier_stack_ptr.skel.h"
 #include "verifier_uninit.skel.h"
@@ -139,6 +140,7 @@ void test_verifier_ref_tracking(void)         { RUN(verifier_ref_tracking); }
 void test_verifier_regalloc(void)             { RUN(verifier_regalloc); }
 void test_verifier_ringbuf(void)              { RUN(verifier_ringbuf); }
 void test_verifier_runtime_jit(void)          { RUN(verifier_runtime_jit); }
+void test_verifier_search_pruning(void)       { RUN(verifier_search_pruning); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
tools/testing/selftests/bpf/progs/verifier_search_pruning.c new file +339 -0

339 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/search_pruning.c deleted +0 -266

266 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#19 lore raw

PATCH 19/24 selftests/bpf: verifier/sock converted to inline assembly

In reply to Eduard Zingerman

Test verifier/sock automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_sock.c       | 980 ++++++++++++++++++
 tools/testing/selftests/bpf/verifier/sock.c   | 706 -------------
 3 files changed, 982 insertions(+), 706 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/sock.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 1ef44e699e9c..60bcff62d968 100644
@@ -50,6 +50,7 @@
 #include "verifier_ringbuf.skel.h"
 #include "verifier_runtime_jit.skel.h"
 #include "verifier_search_pruning.skel.h"
+#include "verifier_sock.skel.h"
 #include "verifier_spill_fill.skel.h"
 #include "verifier_stack_ptr.skel.h"
 #include "verifier_uninit.skel.h"
@@ -141,6 +142,7 @@ void test_verifier_regalloc(void)             { RUN(verifier_regalloc); }
 void test_verifier_ringbuf(void)              { RUN(verifier_ringbuf); }
 void test_verifier_runtime_jit(void)          { RUN(verifier_runtime_jit); }
 void test_verifier_search_pruning(void)       { RUN(verifier_search_pruning); }
+void test_verifier_sock(void)                 { RUN(verifier_sock); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
tools/testing/selftests/bpf/progs/verifier_sock.c new file +980 -0

980 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/sock.c deleted +0 -706

706 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#20 lore raw

PATCH 20/24 selftests/bpf: verifier/spin_lock converted to inline assembly

In reply to Eduard Zingerman

Test verifier/spin_lock automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_spin_lock.c  | 533 ++++++++++++++++++
 .../selftests/bpf/verifier/spin_lock.c        | 447 ---------------
 3 files changed, 535 insertions(+), 447 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_spin_lock.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/spin_lock.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 60bcff62d968..0ea88282859d 100644
@@ -52,6 +52,7 @@
 #include "verifier_search_pruning.skel.h"
 #include "verifier_sock.skel.h"
 #include "verifier_spill_fill.skel.h"
+#include "verifier_spin_lock.skel.h"
 #include "verifier_stack_ptr.skel.h"
 #include "verifier_uninit.skel.h"
 #include "verifier_value_adj_spill.skel.h"
@@ -144,6 +145,7 @@ void test_verifier_runtime_jit(void)          { RUN(verifier_runtime_jit); }
 void test_verifier_search_pruning(void)       { RUN(verifier_search_pruning); }
 void test_verifier_sock(void)                 { RUN(verifier_sock); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
+void test_verifier_spin_lock(void)            { RUN(verifier_spin_lock); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
 void test_verifier_value_adj_spill(void)      { RUN(verifier_value_adj_spill); }
tools/testing/selftests/bpf/progs/verifier_spin_lock.c new file +533 -0

533 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/spin_lock.c deleted +0 -447

447 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#21 lore raw

PATCH 21/24 selftests/bpf: verifier/subreg converted to inline assembly

In reply to Eduard Zingerman

Test verifier/subreg automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../selftests/bpf/progs/verifier_subreg.c     | 673 ++++++++++++++++++
 tools/testing/selftests/bpf/verifier/subreg.c | 533 --------------
 3 files changed, 675 insertions(+), 533 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_subreg.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/subreg.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 0ea88282859d..999b694850d3 100644
@@ -54,6 +54,7 @@
 #include "verifier_spill_fill.skel.h"
 #include "verifier_spin_lock.skel.h"
 #include "verifier_stack_ptr.skel.h"
+#include "verifier_subreg.skel.h"
 #include "verifier_uninit.skel.h"
 #include "verifier_value_adj_spill.skel.h"
 #include "verifier_value.skel.h"
@@ -147,6 +148,7 @@ void test_verifier_sock(void)                 { RUN(verifier_sock); }
 void test_verifier_spill_fill(void)           { RUN(verifier_spill_fill); }
 void test_verifier_spin_lock(void)            { RUN(verifier_spin_lock); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
+void test_verifier_subreg(void)               { RUN(verifier_subreg); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
 void test_verifier_value_adj_spill(void)      { RUN(verifier_value_adj_spill); }
 void test_verifier_value(void)                { RUN(verifier_value); }
tools/testing/selftests/bpf/progs/verifier_subreg.c new file +673 -0

673 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/subreg.c deleted +0 -533

533 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#22 lore raw

PATCH 22/24 selftests/bpf: verifier/unpriv converted to inline assembly

In reply to Eduard Zingerman

Test verifier/unpriv semi-automatically converted to use inline assembly.

The verifier/unpriv.c had to be split in two parts:
- the bulk of the tests is in the progs/verifier_unpriv.c;
- the single test that needs struct bpf_perf_event_data definition is in the progs/verifier_unpriv_perf.c.

The tests above can't be in a single file because:
- first requires inclusion of the filter.h header (to get access to BPF_ST_MEM macro, inline assembler does not support this isntruction);
- the second requires vmlinux.h, which contains definitions conflicting with filter.h.

---
 .../selftests/bpf/prog_tests/verifier.c       |   4 +
 .../selftests/bpf/progs/verifier_unpriv.c     | 726 ++++++++++++++++++
 .../bpf/progs/verifier_unpriv_perf.c          |  34 +
 tools/testing/selftests/bpf/verifier/unpriv.c | 562 --------------
 4 files changed, 764 insertions(+), 562 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_unpriv_perf.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/unpriv.c
tools/testing/selftests/bpf/prog_tests/verifier.c +4 -0
index 999b694850d3..94405bf00b47 100644
@@ -56,6 +56,8 @@
 #include "verifier_stack_ptr.skel.h"
 #include "verifier_subreg.skel.h"
 #include "verifier_uninit.skel.h"
+#include "verifier_unpriv.skel.h"
+#include "verifier_unpriv_perf.skel.h"
 #include "verifier_value_adj_spill.skel.h"
 #include "verifier_value.skel.h"
 #include "verifier_value_or_null.skel.h"
@@ -150,6 +152,8 @@ void test_verifier_spin_lock(void)            { RUN(verifier_spin_lock); }
 void test_verifier_stack_ptr(void)            { RUN(verifier_stack_ptr); }
 void test_verifier_subreg(void)               { RUN(verifier_subreg); }
 void test_verifier_uninit(void)               { RUN(verifier_uninit); }
+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_or_null(void)        { RUN(verifier_value_or_null); }
tools/testing/selftests/bpf/progs/verifier_unpriv.c new file +726 -0

726 lines not on this page · raw message

tools/testing/selftests/bpf/progs/verifier_unpriv_perf.c new file +34 -0
new file mode 100644
index 000000000000..4d77407a0a79
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Converted from tools/testing/selftests/bpf/verifier/unpriv.c */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+
+SEC("perf_event")
+__description("unpriv: spill/fill of different pointers ldx")
+__failure __msg("same insn cannot be used with different pointers")
+__naked void fill_of_different_pointers_ldx(void)
+{
+	asm volatile ("					\
+	r6 = r10;					\
+	r6 += -8;					\
+	if r1 == 0 goto l0_%=;				\
+	r2 = r10;					\
+	r2 += %[__imm_0];				\
+	*(u64*)(r6 + 0) = r2;				\
+l0_%=:	if r1 != 0 goto l1_%=;				\
+	*(u64*)(r6 + 0) = r1;				\
+l1_%=:	r1 = *(u64*)(r6 + 0);				\
+	r1 = *(u64*)(r1 + %[sample_period]);		\
+	r0 = 0;						\
+	exit;						\
+"	:
+	: __imm_const(__imm_0,
+		      -(__s32) offsetof(struct bpf_perf_event_data, sample_period) - 8),
+	  __imm_const(sample_period,
+		      offsetof(struct bpf_perf_event_data, sample_period))
+	: __clobber_all);
+}
+
+char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/verifier/unpriv.c deleted +0 -562

562 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#23 lore raw

PATCH 23/24 selftests/bpf: verifier/value_illegal_alu converted to inline assembly

In reply to Eduard Zingerman

Test verifier/value_illegal_alu automatically converted to use inline assembly.

---
 .../selftests/bpf/prog_tests/verifier.c       |   2 +
 .../bpf/progs/verifier_value_illegal_alu.c    | 149 ++++++++++++++++++
 .../bpf/verifier/value_illegal_alu.c          |  95 -----------
 3 files changed, 151 insertions(+), 95 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/value_illegal_alu.c
tools/testing/selftests/bpf/prog_tests/verifier.c +2 -0
index 94405bf00b47..56b9248a15c0 100644
@@ -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); }
tools/testing/selftests/bpf/progs/verifier_value_illegal_alu.c new file +149 -0

149 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/value_illegal_alu.c deleted +0 -95

95 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#24 lore raw

PATCH 24/24 selftests/bpf: verifier/value_ptr_arith converted to inline assembly

In reply to Eduard Zingerman

Test verifier/value_ptr_arith automatically converted to use inline assembly.

Test cases "sanitation: alu with different scalars 2" and "sanitation: alu with different scalars 3" are updated to avoid -ENOENT as return value, as __retval() annotation only supports numeric literals.

---
 .../selftests/bpf/prog_tests/verifier.c       |   34 +-
 .../bpf/progs/verifier_value_ptr_arith.c      | 1423 +++++++++++++++++
 .../selftests/bpf/verifier/value_ptr_arith.c  | 1140 -------------
 3 files changed, 1451 insertions(+), 1146 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c
 delete mode 100644 tools/testing/selftests/bpf/verifier/value_ptr_arith.c
tools/testing/selftests/bpf/prog_tests/verifier.c +28 -6
index 56b9248a15c0..bcb955adb447 100644
@@ -62,6 +62,7 @@
 #include "verifier_value.skel.h"
 #include "verifier_value_illegal_alu.skel.h"
 #include "verifier_value_or_null.skel.h"
+#include "verifier_value_ptr_arith.skel.h"
 #include "verifier_var_off.skel.h"
 #include "verifier_xadd.skel.h"
 #include "verifier_xdp.skel.h"
@@ -164,29 +165,50 @@ void test_verifier_xadd(void)                 { RUN(verifier_xadd); }
 void test_verifier_xdp(void)                  { RUN(verifier_xdp); }
 void test_verifier_xdp_direct_packet_access(void) { RUN(verifier_xdp_direct_packet_access); }
 
-static int init_array_access_maps(struct bpf_object *obj)
+static int init_test_val_map(struct bpf_object *obj, char *map_name)
 {
-	struct bpf_map *array_ro;
 	struct test_val value = {
 		.index = (6 + 1) * sizeof(int),
 		.foo[6] = 0xabcdef12,
 	};
+	struct bpf_map *map;
 	int err, key = 0;
 
-	array_ro = bpf_object__find_map_by_name(obj, "map_array_ro");
-	if (!ASSERT_OK_PTR(array_ro, "lookup map_array_ro"))
+	map = bpf_object__find_map_by_name(obj, map_name);
+	if (!map) {
+		PRINT_FAIL("Can't find map '%s'\n", map_name);
 		return -EINVAL;
+	}
 
-	err = bpf_map_update_elem(bpf_map__fd(array_ro), &key, &value, 0);
-	if (!ASSERT_OK(err, "map_array_ro update"))
+	err = bpf_map_update_elem(bpf_map__fd(map), &key, &value, 0);
+	if (err) {
+		PRINT_FAIL("Error while updating map '%s': %d\n", map_name, err);
 		return err;
+	}
 
 	return 0;
 }
 
+static int init_array_access_maps(struct bpf_object *obj)
+{
+	return init_test_val_map(obj, "map_array_ro");
+}
+
 void test_verifier_array_access(void)
 {
 	run_tests_aux("verifier_array_access",
 		      verifier_array_access__elf_bytes,
 		      init_array_access_maps);
 }
+
+static int init_value_ptr_arith_maps(struct bpf_object *obj)
+{
+	return init_test_val_map(obj, "map_array_48b");
+}
+
+void test_verifier_value_ptr_arith(void)
+{
+	run_tests_aux("verifier_value_ptr_arith",
+		      verifier_value_ptr_arith__elf_bytes,
+		      init_value_ptr_arith_maps);
+}
tools/testing/selftests/bpf/progs/verifier_value_ptr_arith.c new file +1423 -0

1,423 lines not on this page · raw message

tools/testing/selftests/bpf/verifier/value_ptr_arith.c deleted +0 -1140

1,140 lines not on this page · raw message

Signature · 1 line
2.40.0
#25 lore raw
In reply to Eduard Zingerman
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 8 lines · On Fri, 21 Apr 2023 20:42:10 +0300 you wrote:

This is a follow up for RFC [1]. It migrates a second batch of 23 verifier/*.c tests to inline assembly and use of ./test_progs for actual execution. Link to the first batch is [2].

The migration is done by a python script (see [3]) with minimal manual adjustments.

[...]

Here is the summary with links:
- [bpf-next,01/24] selftests/bpf: Add notion of auxiliary programs for test_loader

    https://git.kernel.org/bpf/bpf-next/c/63bb645b9da3
  - [bpf-next,02/24] selftests/bpf: verifier/bounds converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/c92336559ac0
  - [bpf-next,03/24] selftests/bpf: verifier/bpf_get_stack converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/965a3f913e72
  - [bpf-next,04/24] selftests/bpf: verifier/btf_ctx_access converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/37467c79e16a
  - [bpf-next,05/24] selftests/bpf: verifier/ctx converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/fcd36964f22b
  - [bpf-next,06/24] selftests/bpf: verifier/d_path converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/608028024384
  - [bpf-next,07/24] selftests/bpf: verifier/direct_packet_access converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/0a372c9c0812
  - [bpf-next,08/24] selftests/bpf: verifier/jeq_infer_not_null converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/a5828e3154d1
  - [bpf-next,09/24] selftests/bpf: verifier/loops1 converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/a6fc14dc5e8d
  - [bpf-next,10/24] selftests/bpf: verifier/lwt converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/b427ca576f83
  - [bpf-next,11/24] selftests/bpf: verifier/map_in_map converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/4a400ef9ba41
  - [bpf-next,12/24] selftests/bpf: verifier/map_ptr_mixing converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/aee1779f0dec
  - [bpf-next,13/24] selftests/bpf: verifier/precise converted to inline assembly
    (no matching commit)
  - [bpf-next,14/24] selftests/bpf: verifier/prevent_map_lookup converted to inline assembly
    (no matching commit)
  - [bpf-next,15/24] selftests/bpf: verifier/ref_tracking converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/8be632795996
  - [bpf-next,16/24] selftests/bpf: verifier/regalloc converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/16a42573c253
  - [bpf-next,17/24] selftests/bpf: verifier/runtime_jit converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/65222842ca04
  - [bpf-next,18/24] selftests/bpf: verifier/search_pruning converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/034d9ad25db3
  - [bpf-next,19/24] selftests/bpf: verifier/sock converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/426fc0e3fce2
  - [bpf-next,20/24] selftests/bpf: verifier/spin_lock converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/f323a81806bd
  - [bpf-next,21/24] selftests/bpf: verifier/subreg converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/81d1d6dd4037
  - [bpf-next,22/24] selftests/bpf: verifier/unpriv converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/82887c2568e4
  - [bpf-next,23/24] selftests/bpf: verifier/value_illegal_alu converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/efe25a330b10
  - [bpf-next,24/24] selftests/bpf: verifier/value_ptr_arith converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/4db10a8243df

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
author maintainer
#26 lore raw
Quoted 4 lines · On Fri, 2023-04-21 at 19:40 +0000, [email protected] wrote:

Hello:

This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hi Alexei,

Thank you for merging these changes!

I've noticed that email from the bot does not list commit hashes for patches #13,14 (precise, prevent_map_lookup). And these commits are indeed not in git [1].
Is this intentional?

Thanks,
Eduard

[1] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/log/

Quoted 62 lines · On Fri, 21 Apr 2023 20:42:10 +0300 you wrote:
Quoted 8 lines

This is a follow up for RFC [1]. It migrates a second batch of 23 verifier/*.c tests to inline assembly and use of ./test_progs for actual execution. Link to the first batch is [2].

The migration is done by a python script (see [3]) with minimal manual adjustments.

[...]

Here is the summary with links:
- [bpf-next,01/24] selftests/bpf: Add notion of auxiliary programs for test_loader

    https://git.kernel.org/bpf/bpf-next/c/63bb645b9da3
  - [bpf-next,02/24] selftests/bpf: verifier/bounds converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/c92336559ac0
  - [bpf-next,03/24] selftests/bpf: verifier/bpf_get_stack converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/965a3f913e72
  - [bpf-next,04/24] selftests/bpf: verifier/btf_ctx_access converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/37467c79e16a
  - [bpf-next,05/24] selftests/bpf: verifier/ctx converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/fcd36964f22b
  - [bpf-next,06/24] selftests/bpf: verifier/d_path converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/608028024384
  - [bpf-next,07/24] selftests/bpf: verifier/direct_packet_access converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/0a372c9c0812
  - [bpf-next,08/24] selftests/bpf: verifier/jeq_infer_not_null converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/a5828e3154d1
  - [bpf-next,09/24] selftests/bpf: verifier/loops1 converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/a6fc14dc5e8d
  - [bpf-next,10/24] selftests/bpf: verifier/lwt converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/b427ca576f83
  - [bpf-next,11/24] selftests/bpf: verifier/map_in_map converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/4a400ef9ba41
  - [bpf-next,12/24] selftests/bpf: verifier/map_ptr_mixing converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/aee1779f0dec
  - [bpf-next,13/24] selftests/bpf: verifier/precise converted to inline assembly
    (no matching commit)
  - [bpf-next,14/24] selftests/bpf: verifier/prevent_map_lookup converted to inline assembly
    (no matching commit)
  - [bpf-next,15/24] selftests/bpf: verifier/ref_tracking converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/8be632795996
  - [bpf-next,16/24] selftests/bpf: verifier/regalloc converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/16a42573c253
  - [bpf-next,17/24] selftests/bpf: verifier/runtime_jit converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/65222842ca04
  - [bpf-next,18/24] selftests/bpf: verifier/search_pruning converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/034d9ad25db3
  - [bpf-next,19/24] selftests/bpf: verifier/sock converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/426fc0e3fce2
  - [bpf-next,20/24] selftests/bpf: verifier/spin_lock converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/f323a81806bd
  - [bpf-next,21/24] selftests/bpf: verifier/subreg converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/81d1d6dd4037
  - [bpf-next,22/24] selftests/bpf: verifier/unpriv converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/82887c2568e4
  - [bpf-next,23/24] selftests/bpf: verifier/value_illegal_alu converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/efe25a330b10
  - [bpf-next,24/24] selftests/bpf: verifier/value_ptr_arith converted to inline assembly
    https://git.kernel.org/bpf/bpf-next/c/4db10a8243df

You are awesome, thank you!

#27 lore raw
Quoted 7 lines · Eduard Zingerman
Quoted 4 lines · On Fri, 2023-04-21 at 19:40 +0000, [email protected] wrote:

Hello:

This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 8 lines

Hi Alexei,

Thank you for merging these changes!

I've noticed that email from the bot does not list commit hashes for patches #13,14 (precise, prevent_map_lookup). And these commits are indeed not in git [1].
Is this intentional?

Yes. See other reply.

#28 lore raw
In reply to Eduard Zingerman
Quoted 7 lines · Eduard Zingerman

This is a follow up for RFC [1]. It migrates a second batch of 23 verifier/*.c tests to inline assembly and use of ./test_progs for actual execution. Link to the first batch is [2].

The migration is done by a python script (see [3]) with minimal manual adjustments.

All makes sense to me.
Took 22 out of 24 patches.
The 13 and 14 had conflicts.
Also there is a precision fix in bpf tree.
So we're going to wait for bpf/bpf-next to converge during the merge window next week, then add another precision test as asm and then regenerate conversion of the precision tests. Not sure why 14 was conflicting.

author maintainer
#29 lore raw
Quoted 9 lines · Alexei Starovoitov
Quoted 7 lines · Eduard Zingerman

This is a follow up for RFC [1]. It migrates a second batch of 23 verifier/*.c tests to inline assembly and use of ./test_progs for actual execution. Link to the first batch is [2].

The migration is done by a python script (see [3]) with minimal manual adjustments.

Quoted 8 lines

All makes sense to me.
Took 22 out of 24 patches.
The 13 and 14 had conflicts.
Also there is a precision fix in bpf tree.
So we're going to wait for bpf/bpf-next to converge during the merge window next week, then add another precision test as asm and then regenerate conversion of the precision tests. Not sure why 14 was conflicting.

Oh, understood, thank you.
The #14 does not apply because it also starts from 'p', so the hunk below does not match:

testing/selftests/bpf/prog_tests/verifier.c +1 -0
@@ -41,6 +41,7 @@
 #include "verifier_masking.skel.h"
 #include "verifier_meta_access.skel.h"
 #include "verifier_precise.skel.h"
+#include "verifier_prevent_map_lookup.skel.h"
 #include "verifier_raw_stack.skel.h"
 #include "verifier_raw_tp_writable.skel.h"
 #include "verifier_reg_equal.skel.h"

I will resend it shortly.