RISC-V selftest/bpf fixes
Subsystems (6)
v2 cover RISC-V selftest/bpf fixes
This series contain some fixes for selftests/bpf when building/running on a RISC-V host. Details can be found in each individual commit.
Cheers,
Björn
v2:
Makefile cosmetics. (Andrii)
Simplified unpriv check and added comment. (Andrii)
Björn Töpel (3):
selftests/bpf: Fix broken riscv build
selftests/bpf: Avoid running unprivileged tests with alignment
requirements
selftests/bpf: Mark tests that require unaligned memory access
tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_verifier.c | 13 ++++++ .../selftests/bpf/verifier/ctx_sk_lookup.c | 7 +++ .../bpf/verifier/direct_value_access.c | 3 ++ .../testing/selftests/bpf/verifier/map_ptr.c | 1 + .../selftests/bpf/verifier/raw_tp_writable.c | 1 + .../selftests/bpf/verifier/ref_tracking.c | 4 ++ .../testing/selftests/bpf/verifier/regalloc.c | 8 ++++ .../selftests/bpf/verifier/wide_access.c | 46 +++++++++++-------- 9 files changed, 67 insertions(+), 19 deletions(-)
base-commit: ea87ae85c9b31303a2e9d4c769d9f3ee8a3a60d1
Signature · 1 line
2.27.0
PATCH v2 1/3 selftests/bpf: Fix broken riscv build
The selftests/bpf Makefile includes system include directories from the host, when building BPF programs. On RISC-V glibc requires that __riscv_xlen is defined. This is not the case for "clang -target bpf", which messes up __WORDSIZE (errno.h -> ... -> wordsize.h) and breaks the build.
By explicitly defining __risc_xlen correctly for riscv, we can workaround this.
--- tools/testing/selftests/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -219,7 +219,8 @@ $(RESOLVE_BTFIDS): $(BPFOBJ) | $(BUILD_DIR)/resolve_btfids \ # build would have failed anyways. define get_sys_includes $(shell $(1) -v -E - </dev/null 2>&1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ +$(shell $(1) -dM -E - </dev/null | grep '#define __riscv_xlen ' | sed 's/#define /-D/' | sed 's/ /=/') endef # Determine target endianness.
Signature · 1 line
2.27.0
PATCH v2 2/3 selftests/bpf: Avoid running unprivileged tests with alignment requirements
In reply to Björn TöpelSome architectures have strict alignment requirements. In that case, the BPF verifier detects if a program has unaligned accesses and rejects them. A user can pass BPF_F_ANY_ALIGNMENT to a program to override this check. That, however, will only work when a privileged user loads a program. An unprivileged user loading a program with this flag will be rejected prior entering the verifier.
Hence, it does not make sense to load unprivileged programs without strict alignment when testing the verifier. This patch avoids exactly that.
--- tools/testing/selftests/bpf/test_verifier.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/testing/selftests/bpf/test_verifier.c +13 -0
@@ -1152,6 +1152,19 @@ static void get_unpriv_disabled()static bool test_as_unpriv (struct bpf_test *test) { +#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS +/* Some architectures have strict alignment requirements. In +* that case, the BPF verifier detects if a program has +* unaligned accesses and rejects them. A user can pass +* BPF_F_ANY_ALIGNMENT to a program to override this +* check. That, however, will only work when a privileged user +* loads a program. An unprivileged user loading a program +* with this flag will be rejected prior entering the +* verifier. +*/ +if (test->flags &F_NEEDS_EFFICIENT_UNALIGNED_ACCESS ) +return false; +#endif return !test->prog_type || test->prog_type ==BPF_PROG_TYPE_SOCKET_FILTER || test->prog_type ==BPF_PROG_TYPE_CGROUP_SKB ;
Signature · 1 line
2.27.0
PATCH v2 3/3 selftests/bpf: Mark tests that require unaligned memory access
In reply to Björn TöpelA lot of tests require unaligned memory access to work. Mark the tests as such, so that they can be avoided on unsupported architectures such as RISC-V.
--- .../selftests/bpf/verifier/ctx_sk_lookup.c | 7 +++ .../bpf/verifier/direct_value_access.c | 3 ++ .../testing/selftests/bpf/verifier/map_ptr.c | 1 + .../selftests/bpf/verifier/raw_tp_writable.c | 1 + .../selftests/bpf/verifier/ref_tracking.c | 4 ++ .../testing/selftests/bpf/verifier/regalloc.c | 8 ++++ .../selftests/bpf/verifier/wide_access.c | 46 +++++++++++-------- 7 files changed, 52 insertions(+), 18 deletions(-)
tools/testing/selftests/bpf/verifier/ctx_sk_lookup.c +7 -0
@@ -266,6 +266,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "invalid 8-byte read from bpf_sk_lookup remote_ip4 field",
@@ -292,6 +293,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "invalid 8-byte read from bpf_sk_lookup remote_port field",
@@ -305,6 +307,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "invalid 8-byte read from bpf_sk_lookup local_ip4 field",
@@ -331,6 +334,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "invalid 8-byte read from bpf_sk_lookup local_port field",
@@ -344,6 +348,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },/* invalid 1,2,4-byte reads from 8-byte fields in bpf_sk_lookup */ {
@@ -410,6 +415,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "invalid 4-byte unaligned read from bpf_sk_lookup at even offset",
@@ -422,6 +428,7 @@ .result = REJECT, .prog_type = BPF_PROG_TYPE_SK_LOOKUP, .expected_attach_type = BPF_SK_LOOKUP, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },/* in-bound and out-of-bound writes to bpf_sk_lookup */ {
tools/testing/selftests/bpf/verifier/direct_value_access.c +3 -0
@@ -69,6 +69,7 @@ .fixup_map_array_48b = { 1 }, .result = REJECT, .errstr = "R1 min value is outside of the allowed memory range", + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "direct map access, write test 7",
@@ -195,6 +196,7 @@ .fixup_map_array_48b = { 1, 3 }, .result = REJECT, .errstr = "invalid access to map value, value_size=48 off=47 size=2", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "direct map access, write test 17",
@@ -209,6 +211,7 @@ .fixup_map_array_48b = { 1, 3 }, .result = REJECT, .errstr = "invalid access to map value, value_size=48 off=47 size=2", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "direct map access, write test 18",
tools/testing/selftests/bpf/verifier/map_ptr.c +1 -0
@@ -44,6 +44,7 @@ .errstr_unpriv = "bpf_array access is allowed only to CAP_PERFMON and CAP_SYS_ADMIN", .result = REJECT, .errstr = "cannot access ptr member ops with moff 0 in struct bpf_map with off 1 size 4", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "bpf_map_ptr: read ops field accepted",
tools/testing/selftests/bpf/verifier/raw_tp_writable.c +1 -0
@@ -31,4 +31,5 @@ .fixup_map_hash_8b = { 1, }, .prog_type = BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, .errstr = "R6 invalid variable buffer offset: off=0, var_off=(0x0; 0xffffffff)", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, },
tools/testing/selftests/bpf/verifier/ref_tracking.c +4 -0
@@ -675,6 +675,7 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, .errstr = "invalid mem access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "reference tracking: use ptr from bpf_sk_fullsock() after release",
@@ -698,6 +699,7 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, .errstr = "invalid mem access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "reference tracking: use ptr from bpf_sk_fullsock(tp) after release",
@@ -725,6 +727,7 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, .errstr = "invalid mem access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "reference tracking: use sk after bpf_sk_release(tp)",
@@ -747,6 +750,7 @@ .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, .errstr = "invalid mem access", + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "reference tracking: use ptr from bpf_get_listener_sock() after bpf_sk_release(sk)",
tools/testing/selftests/bpf/verifier/regalloc.c +8 -0
@@ -21,6 +21,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc negative",
@@ -71,6 +72,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc src_reg negative",
@@ -97,6 +99,7 @@ .result = REJECT, .errstr = "invalid access to map value, value_size=48 off=44 size=8", .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "regalloc and spill",
@@ -126,6 +129,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc and spill negative",
@@ -156,6 +160,7 @@ .result = REJECT, .errstr = "invalid access to map value, value_size=48 off=48 size=8", .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, }, { "regalloc three regs",
@@ -182,6 +187,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc after call",
@@ -210,6 +216,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc in callee",
@@ -240,6 +247,7 @@ .fixup_map_hash_48b = { 4 }, .result = ACCEPT, .prog_type = BPF_PROG_TYPE_TRACEPOINT, + .flags =F_NEEDS_EFFICIENT_UNALIGNED_ACCESS , }, { "regalloc, spill, JEQ",
tools/testing/selftests/bpf/verifier/wide_access.c +28 -18
89 lines not on this page · raw message
Signature · 1 line
2.27.0
Nice, thanks for the fixes!
(For the whole series:)
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
This series was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This series was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 18 Nov 2020 08:16:37 +0100 you wrote:
This series contain some fixes for selftests/bpf when building/running on a RISC-V host. Details can be found in each individual commit.
Cheers,
Björn[...]
Here is the summary with links:
- [bpf-next,v2,1/3] selftests/bpf: Fix broken riscv build
https://git.kernel.org/bpf/bpf-next/c/6016df8fe874 - [bpf-next,v2,2/3] selftests/bpf: Avoid running unprivileged tests with alignment requirements https://git.kernel.org/bpf/bpf-next/c/c77b0589ca29 - [bpf-next,v2,3/3] selftests/bpf: Mark tests that require unaligned memory access https://git.kernel.org/bpf/bpf-next/c/6007b23cc755
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html