Commit 235d2ef2 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

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: default avatarAndrii Nakryiko <andrii@kernel.org>
parents c21dc529 d0c0b48c

tools/testing/selftests/bpf/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -532,8 +532,10 @@ TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ 
		       $(OUTPUT)/liburandom_read.so			\

		       $(OUTPUT)/xdp_synproxy				\

		       $(OUTPUT)/sign-file				\

		       ima_setup.sh verify_sig_setup.sh			\

		       $(wildcard progs/btf_dump_test_case_*.c)

		       ima_setup.sh 					\

		       verify_sig_setup.sh				\

		       $(wildcard progs/btf_dump_test_case_*.c)		\

		       $(wildcard progs/*.bpf.o)

TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE

TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS

$(eval $(call DEFINE_TEST_RUNNER,test_progs))

tools/testing/selftests/bpf/config

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CONFIG_BPF_LIRC_MODE2=y 
CONFIG_BPF_LSM=y

CONFIG_BPF_STREAM_PARSER=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_UNPRIV_DEFAULT_OFF=n

# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set

CONFIG_CGROUP_BPF=y

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y
@@ -71,7 +71,7 @@ CONFIG_NF_NAT=y 
CONFIG_RC_CORE=y

CONFIG_SECURITY=y

CONFIG_SECURITYFS=y

CONFIG_TEST_BPF=y

CONFIG_TEST_BPF=m

CONFIG_USERFAULTFD=y

CONFIG_VXLAN=y

CONFIG_XDP_SOCKETS=y