selftests/bpf: add "any alignment" annotation for some tests

RISC-V does, in-general, not have "efficient unaligned access". When
testing the RISC-V BPF JIT, some selftests failed in the verification
due to misaligned access. Annotate these tests with the
F_NEEDS_EFFICIENT_UNALIGNED_ACCESS flag.

Signed-off-by: Björn Töpel <bjorn.topel@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/tools/testing/selftests/bpf/verifier/ctx_sk_msg.c b/tools/testing/selftests/bpf/verifier/ctx_sk_msg.c
index b0195770da6a738e36324dfbf8b0eff0cc770cf5..c6c69220a5691fdc09508b535654c7987f243cf0 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/ctx_sk_msg.c
+++ b/tools/testing/selftests/bpf/verifier/ctx_sk_msg.c
@@ -100,6 +100,7 @@
        .errstr = "invalid bpf_context access",
        .result = REJECT,
        .prog_type = BPF_PROG_TYPE_SK_MSG,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "invalid read past end of SK_MSG",

diff --git a/tools/testing/selftests/bpf/verifier/ctx_skb.c b/tools/testing/selftests/bpf/verifier/ctx_skb.c
index 881f1c7f57a1be0e6376a7c60acffb427e471ead..c660deb582f169b117a24685d429230dc847521d 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/ctx_skb.c
+++ b/tools/testing/selftests/bpf/verifier/ctx_skb.c
@@ -687,6 +687,7 @@
        },
        .errstr = "invalid bpf_context access",
        .result = REJECT,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "check skb->hash half load not permitted, unaligned 3",

diff --git a/tools/testing/selftests/bpf/verifier/jmp32.c b/tools/testing/selftests/bpf/verifier/jmp32.c
index ceb39ffa0e88373982b18f5a8f6c02041ac7866c..f0961c58581ea98036a725904bb2268c6faf6afe 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/jmp32.c
+++ b/tools/testing/selftests/bpf/verifier/jmp32.c
@@ -27,6 +27,7 @@
                  .data64 = { 1ULL << 63 | 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jset32: BPF_X",
@@ -58,6 +59,7 @@
                  .data64 = { 1ULL << 63 | 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jset32: min/max deduction",
@@ -93,6 +95,7 @@
                  .data64 = { -1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jeq32: BPF_X",
@@ -119,6 +122,7 @@
                  .data64 = { 1ULL << 63 | 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jeq32: min/max deduction",
@@ -154,6 +158,7 @@
                  .data64 = { -1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jne32: BPF_X",
@@ -180,6 +185,7 @@
                  .data64 = { 1ULL << 63 | 2, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jne32: min/max deduction",
@@ -218,6 +224,7 @@
                  .data64 = { 0, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jge32: BPF_X",
@@ -244,6 +251,7 @@
                  .data64 = { (UINT_MAX - 1) | 2ULL << 32, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jge32: min/max deduction",
@@ -284,6 +292,7 @@
                  .data64 = { 0, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jgt32: BPF_X",
@@ -310,6 +319,7 @@
                  .data64 = { (UINT_MAX - 1) | 2ULL << 32, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jgt32: min/max deduction",
@@ -350,6 +360,7 @@
                  .data64 = { INT_MAX, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jle32: BPF_X",
@@ -376,6 +387,7 @@
                  .data64 = { UINT_MAX, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jle32: min/max deduction",
@@ -416,6 +428,7 @@
                  .data64 = { INT_MAX - 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jlt32: BPF_X",
@@ -442,6 +455,7 @@
                  .data64 = { (INT_MAX - 1) | 3ULL << 32, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jlt32: min/max deduction",
@@ -482,6 +496,7 @@
                  .data64 = { -2, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsge32: BPF_X",
@@ -508,6 +523,7 @@
                  .data64 = { -2, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsge32: min/max deduction",
@@ -548,6 +564,7 @@
                  .data64 = { 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsgt32: BPF_X",
@@ -574,6 +591,7 @@
                  .data64 = { 0x7fffffff, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsgt32: min/max deduction",
@@ -614,6 +632,7 @@
                  .data64 = { 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsle32: BPF_X",
@@ -640,6 +659,7 @@
                  .data64 = { 0x7fffffff | 2ULL << 32, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jsle32: min/max deduction",
@@ -680,6 +700,7 @@
                  .data64 = { 1, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jslt32: BPF_X",
@@ -706,6 +727,7 @@
                  .data64 = { 0x7fffffff | 2ULL << 32, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jslt32: min/max deduction",

diff --git a/tools/testing/selftests/bpf/verifier/jset.c b/tools/testing/selftests/bpf/verifier/jset.c
index 7e14037acfafc7d45111bff0167db935bfaa0b79..8dcd4e0383d5739a17ab217ee96df1cdbd982a3f 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/jset.c
+++ b/tools/testing/selftests/bpf/verifier/jset.c
@@ -53,6 +53,7 @@
                  .data64 = { ~0ULL, }
                },
        },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jset: sign-extend",
@@ -70,6 +71,7 @@
        .result = ACCEPT,
        .retval = 2,
        .data = { 1, 0, 0, 0, 0, 0, 0, 1, },
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "jset: known const compare",

diff --git a/tools/testing/selftests/bpf/verifier/spill_fill.c b/tools/testing/selftests/bpf/verifier/spill_fill.c
index d58db72fdfe8074dca88a6c011f18f4617d6a18b..45d43bf82f269190bc51ab29f7032e909103dca0 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/spill_fill.c
+++ b/tools/testing/selftests/bpf/verifier/spill_fill.c
@@ -46,6 +46,7 @@
        .errstr_unpriv = "attempt to corrupt spilled",
        .errstr = "R0 invalid mem access 'inv",
        .result = REJECT,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "check corrupted spill/fill, LSB",

diff --git a/tools/testing/selftests/bpf/verifier/spin_lock.c b/tools/testing/selftests/bpf/verifier/spin_lock.c
index d829eef372a4129e8e0fdbe1e653e10d504913d6..781621facae48d4a460aa3839196b3f29a30dbbb 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/spin_lock.c
+++ b/tools/testing/selftests/bpf/verifier/spin_lock.c
@@ -83,6 +83,7 @@
        .result_unpriv = REJECT,
        .errstr_unpriv = "",
        .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "spin_lock: test4 direct ld/st",
@@ -112,6 +113,7 @@
        .result_unpriv = REJECT,
        .errstr_unpriv = "",
        .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "spin_lock: test5 call within a locked region",

diff --git a/tools/testing/selftests/bpf/verifier/value_ptr_arith.c b/tools/testing/selftests/bpf/verifier/value_ptr_arith.c
index 9ab5ace83e023cf7dd86a14c9da26f29874a1e33..4b721a77bebb01e7354bcff8f0fd99b84b8b6d3c 100644 (file)
--- a/tools/testing/selftests/bpf/verifier/value_ptr_arith.c
+++ b/tools/testing/selftests/bpf/verifier/value_ptr_arith.c
@@ -512,6 +512,7 @@
        .fixup_map_array_48b = { 3 },
        .result = ACCEPT,
        .retval = 0xabcdef12,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "map access: unknown scalar += value_ptr, 3",
@@ -537,6 +538,7 @@
        .result_unpriv = REJECT,
        .errstr_unpriv = "R0 pointer arithmetic of map value goes out of range",
        .retval = 0xabcdef12,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "map access: unknown scalar += value_ptr, 4",
@@ -559,6 +561,7 @@
        .result = REJECT,
        .errstr = "R1 max value is outside of the array range",
        .errstr_unpriv = "R1 pointer arithmetic of map value goes out of range",
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "map access: value_ptr += unknown scalar, 1",
@@ -598,6 +601,7 @@
        .fixup_map_array_48b = { 3 },
        .result = ACCEPT,
        .retval = 0xabcdef12,
+       .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
 },
 {
        "map access: value_ptr += unknown scalar, 3",