Commit 16962b24 authored by John Fastabend's avatar John Fastabend Committed by Daniel Borkmann
Browse files

bpf: sockmap, add selftests 



This adds a new test program test_sockmap which is the old sample
sockmap program. By moving the sample program here we can now run it
as part of the self tests suite. To support this a populate_progs()
routine is added to load programs and maps which was previously done
with load_bpf_file(). This is needed because self test libs do not
provide a similar routine. Also we now use the cgroup_helpers
routines to manage cgroup use instead of manually creating one and
supplying it to the CLI.

Notice we keep the CLI around though because it is useful for dbg
and specialized testing.

To run use ./test_sockmap and the result should be,

Summary 660 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 5d9ffeae

tools/include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ enum bpf_func_id { 
/* BPF_FUNC_skb_set_tunnel_key flags. */

#define BPF_F_ZERO_CSUM_TX		(1ULL << 1)

#define BPF_F_DONT_FRAGMENT		(1ULL << 2)

#define BPF_F_SEQ_NUMBER		(1ULL << 3)



/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and

 * BPF_FUNC_perf_event_read_value flags.

tools/include/uapi/linux/if_link.h

+39 −0
Original line number Diff line number Diff line
@@ -941,4 +941,43 @@ enum { 
	IFLA_EVENT_BONDING_OPTIONS,	/* change in bonding options */

};



/* tun section */



enum {

	IFLA_TUN_UNSPEC,

	IFLA_TUN_OWNER,

	IFLA_TUN_GROUP,

	IFLA_TUN_TYPE,

	IFLA_TUN_PI,

	IFLA_TUN_VNET_HDR,

	IFLA_TUN_PERSIST,

	IFLA_TUN_MULTI_QUEUE,

	IFLA_TUN_NUM_QUEUES,

	IFLA_TUN_NUM_DISABLED_QUEUES,

	__IFLA_TUN_MAX,

};



#define IFLA_TUN_MAX (__IFLA_TUN_MAX - 1)



/* rmnet section */



#define RMNET_FLAGS_INGRESS_DEAGGREGATION         (1U << 0)

#define RMNET_FLAGS_INGRESS_MAP_COMMANDS          (1U << 1)

#define RMNET_FLAGS_INGRESS_MAP_CKSUMV4           (1U << 2)

#define RMNET_FLAGS_EGRESS_MAP_CKSUMV4            (1U << 3)



enum {

	IFLA_RMNET_UNSPEC,

	IFLA_RMNET_MUX_ID,

	IFLA_RMNET_FLAGS,

	__IFLA_RMNET_MAX,

};



#define IFLA_RMNET_MAX	(__IFLA_RMNET_MAX - 1)



struct ifla_rmnet_flags {

	__u32	flags;

	__u32	mask;

};



#endif /* _UAPI_LINUX_IF_LINK_H */

tools/lib/bpf/libbpf.c

+2 −2
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ BPF_PROG_TYPE_FNS(raw_tracepoint, BPF_PROG_TYPE_RAW_TRACEPOINT); 
BPF_PROG_TYPE_FNS(xdp, BPF_PROG_TYPE_XDP);

BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT);



static void bpf_program__set_expected_attach_type(struct bpf_program *prog,

void bpf_program__set_expected_attach_type(struct bpf_program *prog,

					   enum bpf_attach_type type)

{

	prog->expected_attach_type = type;

tools/lib/bpf/libbpf.h

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ int bpf_program__set_sched_act(struct bpf_program *prog); 
int bpf_program__set_xdp(struct bpf_program *prog);

int bpf_program__set_perf_event(struct bpf_program *prog);

void bpf_program__set_type(struct bpf_program *prog, enum bpf_prog_type type);

void bpf_program__set_expected_attach_type(struct bpf_program *prog,

					   enum bpf_attach_type type);



bool bpf_program__is_socket_filter(struct bpf_program *prog);

bool bpf_program__is_tracepoint(struct bpf_program *prog);

tools/testing/selftests/bpf/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ urandom_read: urandom_read.c 
# Order correspond to 'make run_tests' order

TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \

	test_align test_verifier_log test_dev_cgroup test_tcpbpf_user \

	test_sock test_btf

	test_sock test_btf test_sockmap



TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test_obj_id.o \

	test_pkt_md_access.o test_xdp_redirect.o test_xdp_meta.o sockmap_parse_prog.o     \
@@ -32,7 +32,7 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test 
	test_l4lb_noinline.o test_xdp_noinline.o test_stacktrace_map.o \

	sample_map_ret0.o test_tcpbpf_kern.o test_stacktrace_build_id.o \

	sockmap_tcp_msg_prog.o connect4_prog.o connect6_prog.o test_adjust_tail.o \

	test_btf_haskv.o test_btf_nokv.o

	test_btf_haskv.o test_btf_nokv.o test_sockmap_kern.o



# Order correspond to 'make run_tests' order

TEST_PROGS := test_kmod.sh \
@@ -56,6 +56,7 @@ $(TEST_GEN_PROGS_EXTENDED): $(OUTPUT)/libbpf.a 
$(OUTPUT)/test_dev_cgroup: cgroup_helpers.c

$(OUTPUT)/test_sock: cgroup_helpers.c

$(OUTPUT)/test_sock_addr: cgroup_helpers.c

$(OUTPUT)/test_sockmap: cgroup_helpers.c



.PHONY: force

CRA Git | Maintained and supported by SUSTech CRA and CCSE