Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5921a0fc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-selftests' 



Daniel Borkmann says:

====================
Move to BPF selftests

This set improves the test_verifier and test_maps suite and moves
it over to a new BPF selftest directory, so we can keep improving
it under kernel selftest umbrella. This also integrates a test
script for checking test_bpf.ko under various JIT options.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1441dc99 5aa5bd14

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2521,6 +2521,8 @@ L: netdev@vger.kernel.org 
L:	linux-kernel@vger.kernel.org

S:	Supported

F:	kernel/bpf/

F:	tools/testing/selftests/bpf/

F:	lib/test_bpf.c



BROADCOM B44 10/100 ETHERNET DRIVER

M:	Michael Chan <michael.chan@broadcom.com>
@@ -8413,7 +8415,6 @@ F: include/uapi/linux/net_namespace.h 
F:	tools/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c

F:	lib/test_bpf.c



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>

samples/bpf/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
obj- := dummy.o



# List of programs to build

hostprogs-y := test_verifier test_maps

hostprogs-y += sock_example

hostprogs-y += fds_example

hostprogs-y += sockex1
@@ -28,8 +27,6 @@ hostprogs-y += test_current_task_under_cgroup 
hostprogs-y += trace_event

hostprogs-y += sampleip



test_verifier-objs := test_verifier.o libbpf.o

test_maps-objs := test_maps.o libbpf.o

sock_example-objs := sock_example.o libbpf.o

fds_example-objs := bpf_load.o libbpf.o fds_example.o

sockex1-objs := bpf_load.o libbpf.o sockex1_user.o

tools/include/linux/filter.h

+24 −0
Original line number Diff line number Diff line
@@ -218,6 +218,30 @@ 
		.off   = OFF,					\

		.imm   = IMM })



/* BPF_LD_IMM64 macro encodes single 'load 64-bit immediate' insn */



#define BPF_LD_IMM64(DST, IMM)					\

	BPF_LD_IMM64_RAW(DST, 0, IMM)



#define BPF_LD_IMM64_RAW(DST, SRC, IMM)				\

	((struct bpf_insn) {					\

		.code  = BPF_LD | BPF_DW | BPF_IMM,		\

		.dst_reg = DST,					\

		.src_reg = SRC,					\

		.off   = 0,					\

		.imm   = (__u32) (IMM) }),			\

	((struct bpf_insn) {					\

		.code  = 0, /* zero is reserved opcode */	\

		.dst_reg = 0,					\

		.src_reg = 0,					\

		.off   = 0,					\

		.imm   = ((__u64) (IMM)) >> 32 })



/* pseudo BPF_LD_IMM64 insn used to refer to process-local map_fd */



#define BPF_LD_MAP_FD(DST, MAP_FD)				\

	BPF_LD_IMM64_RAW(DST, BPF_PSEUDO_MAP_FD, MAP_FD)



/* Program exit */



#define BPF_EXIT_INSN()						\

tools/testing/selftests/Makefile

+2 −1
Original line number Diff line number Diff line 
TARGETS = breakpoints

TARGETS =  bpf

TARGETS += breakpoints

TARGETS += capabilities

TARGETS += cpu-hotplug

TARGETS += efivarfs

tools/testing/selftests/bpf/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
test_verifier

test_maps