tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'BPF selftests fixes'

Daan De Meyer says:

====================

This patch series fixes a few issues I've found while integrating the
bpf selftests into systemd's mkosi development environment.
====================

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

Andrii Nakryiko 235d2ef2 c21dc529

+6 -4
+4 -2
tools/testing/selftests/bpf/Makefile
··· 532 532 $(OUTPUT)/liburandom_read.so \ 533 533 $(OUTPUT)/xdp_synproxy \ 534 534 $(OUTPUT)/sign-file \ 535 - ima_setup.sh verify_sig_setup.sh \ 536 - $(wildcard progs/btf_dump_test_case_*.c) 535 + ima_setup.sh \ 536 + verify_sig_setup.sh \ 537 + $(wildcard progs/btf_dump_test_case_*.c) \ 538 + $(wildcard progs/*.bpf.o) 537 539 TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE 538 540 TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS 539 541 $(eval $(call DEFINE_TEST_RUNNER,test_progs))
+2 -2
tools/testing/selftests/bpf/config
··· 8 8 CONFIG_BPF_LSM=y 9 9 CONFIG_BPF_STREAM_PARSER=y 10 10 CONFIG_BPF_SYSCALL=y 11 - CONFIG_BPF_UNPRIV_DEFAULT_OFF=n 11 + # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set 12 12 CONFIG_CGROUP_BPF=y 13 13 CONFIG_CRYPTO_HMAC=y 14 14 CONFIG_CRYPTO_SHA256=y ··· 71 71 CONFIG_RC_CORE=y 72 72 CONFIG_SECURITY=y 73 73 CONFIG_SECURITYFS=y 74 - CONFIG_TEST_BPF=y 74 + CONFIG_TEST_BPF=m 75 75 CONFIG_USERFAULTFD=y 76 76 CONFIG_VXLAN=y 77 77 CONFIG_XDP_SOCKETS=y