bpf: selftest additions for SOCKHASH (b8b394fa) · Commits · 戴 / test

tools/include/uapi/linux/bpf.h

+52 −2

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ enum bpf_map_type {
		BPF_MAP_TYPE_SOCKMAP,
		BPF_MAP_TYPE_CPUMAP,
		BPF_MAP_TYPE_XSKMAP,
		BPF_MAP_TYPE_SOCKHASH,
		};

		enum bpf_prog_type {
		@@ -1828,7 +1829,6 @@ union bpf_attr {
		* Return
		* 0 on success, or a negative error in case of failure.
		*
		*
		* int bpf_fib_lookup(void ctx, struct bpf_fib_lookup params, int plen, u32 flags)
		* Description
		* Do FIB lookup in kernel tables using parameters in params.
		@@ -1855,6 +1855,53 @@ union bpf_attr {
		* Egress device index on success, 0 if packet needs to continue
		* up the stack for further processing or a negative error in case
		* of failure.
		*
		* int bpf_sock_hash_update(struct bpf_sock_ops_kern skops, struct bpf_map map, void *key, u64 flags)
		* Description
		* Add an entry to, or update a sockhash map referencing sockets.
		* The skops is used as a new value for the entry associated to
		* key. flags is one of:
		*
		* BPF_NOEXIST
		* The entry for key must not exist in the map.
		* BPF_EXIST
		* The entry for key must already exist in the map.
		* BPF_ANY
		* No condition on the existence of the entry for key.
		*
		* If the map has eBPF programs (parser and verdict), those will
		* be inherited by the socket being added. If the socket is
		* already attached to eBPF programs, this results in an error.
		* Return
		* 0 on success, or a negative error in case of failure.
		*
		* int bpf_msg_redirect_hash(struct sk_msg_buff msg, struct bpf_map map, void *key, u64 flags)
		* Description
		* This helper is used in programs implementing policies at the
		* socket level. If the message msg is allowed to pass (i.e. if
		* the verdict eBPF program returns SK_PASS), redirect it to
		* the socket referenced by map (of type
		* BPF_MAP_TYPE_SOCKHASH) using hash key. Both ingress and
		* egress interfaces can be used for redirection. The
		* BPF_F_INGRESS value in flags is used to make the
		* distinction (ingress path is selected if the flag is present,
		* egress path otherwise). This is the only flag supported for now.
		* Return
		* SK_PASS on success, or SK_DROP on error.
		*
		* int bpf_sk_redirect_hash(struct sk_buff skb, struct bpf_map map, void *key, u64 flags)
		* Description
		* This helper is used in programs implementing policies at the
		* skb socket level. If the sk_buff skb is allowed to pass (i.e.
		* if the verdeict eBPF program returns SK_PASS), redirect it
		* to the socket referenced by map (of type
		* BPF_MAP_TYPE_SOCKHASH) using hash key. Both ingress and
		* egress interfaces can be used for redirection. The
		* BPF_F_INGRESS value in flags is used to make the
		* distinction (ingress path is selected if the flag is present,
		* egress otherwise). This is the only flag supported for now.
		* Return
		* SK_PASS on success, or SK_DROP on error.
		*/
		#define __BPF_FUNC_MAPPER(FN) \
		FN(unspec), \
		@@ -1926,7 +1973,10 @@ union bpf_attr {
		FN(skb_get_xfrm_state), \
		FN(get_stack), \
		FN(skb_load_bytes_relative), \
		FN(fib_lookup),
		FN(fib_lookup), \
		FN(sock_hash_update), \
		FN(msg_redirect_hash), \
		FN(sk_redirect_hash),

		/* integer value in 'imm' field of BPF_CALL instruction selects which helper
		* function eBPF program intends to call

tools/testing/selftests/bpf/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test
		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_sockmap_kern.o test_tunnel_kern.o \
		test_get_stack_rawtp.o
		test_get_stack_rawtp.o test_sockmap_kern.o test_sockhash_kern.o

		# Order correspond to 'make run_tests' order
		TEST_PROGS := test_kmod.sh \

tools/testing/selftests/bpf/bpf_helpers.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -75,9 +75,14 @@ static int (bpf_sock_ops_cb_flags_set)(void ctx, int flags) =
		(void *) BPF_FUNC_sock_ops_cb_flags_set;
		static int (bpf_sk_redirect_map)(void ctx, void *map, int key, int flags) =
		(void *) BPF_FUNC_sk_redirect_map;
		static int (bpf_sk_redirect_hash)(void ctx, void map, void key, int flags) =
		(void *) BPF_FUNC_sk_redirect_hash;
		static int (bpf_sock_map_update)(void map, void key, void value,
		unsigned long long flags) =
		(void *) BPF_FUNC_sock_map_update;
		static int (bpf_sock_hash_update)(void map, void key, void value,
		unsigned long long flags) =
		(void *) BPF_FUNC_sock_hash_update;
		static int (bpf_perf_event_read_value)(void map, unsigned long long flags,
		void *buf, unsigned int buf_size) =
		(void *) BPF_FUNC_perf_event_read_value;
		@@ -88,6 +93,9 @@ static int (bpf_override_return)(void ctx, unsigned long rc) =
		(void *) BPF_FUNC_override_return;
		static int (bpf_msg_redirect_map)(void ctx, void *map, int key, int flags) =
		(void *) BPF_FUNC_msg_redirect_map;
		static int (bpf_msg_redirect_hash)(void ctx,
		void map, void key, int flags) =
		(void *) BPF_FUNC_msg_redirect_hash;
		static int (bpf_msg_apply_bytes)(void ctx, int len) =
		(void *) BPF_FUNC_msg_apply_bytes;
		static int (bpf_msg_cork_bytes)(void ctx, int len) =

tools/testing/selftests/bpf/test_sockhash_kern.c

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		// Copyright (c) 2018 Covalent IO, Inc. http://covalent.io
		#undef SOCKMAP
		#define TEST_MAP_TYPE BPF_MAP_TYPE_SOCKHASH
		#include "./test_sockmap_kern.h"

tools/testing/selftests/bpf/test_sockmap.c

+20 −7

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@ static void running_handler(int a);
		#define S1_PORT 10000
		#define S2_PORT 10001

		#define BPF_FILENAME "test_sockmap_kern.o"
		#define BPF_SOCKMAP_FILENAME "test_sockmap_kern.o"
		#define BPF_SOCKHASH_FILENAME "test_sockhash_kern.o"
		#define CG_PATH "/sockmap"

		/* global sockets */
		@@ -1260,9 +1261,8 @@ int prog_type[] = {
		BPF_PROG_TYPE_SK_MSG,
		};

		static int populate_progs(void)
		static int populate_progs(char *bpf_file)
		{
		char *bpf_file = BPF_FILENAME;
		struct bpf_program *prog;
		struct bpf_object *obj;
		int i = 0;
		@@ -1306,11 +1306,11 @@ static int populate_progs(void)
		return 0;
		}

		static int test_suite(void)
		static int __test_suite(char *bpf_file)
		{
		int cg_fd, err;

		err = populate_progs();
		err = populate_progs(bpf_file);
		if (err < 0) {
		fprintf(stderr, "ERROR: (%i) load bpf failed\n", err);
		return err;
		@@ -1347,17 +1347,30 @@ static int test_suite(void)

		out:
		printf("Summary: %i PASSED %i FAILED\n", passed, failed);
		cleanup_cgroup_environment();
		close(cg_fd);
		return err;
		}

		static int test_suite(void)
		{
		int err;

		err = __test_suite(BPF_SOCKMAP_FILENAME);
		if (err)
		goto out;
		err = __test_suite(BPF_SOCKHASH_FILENAME);
		out:
		return err;
		}

		int main(int argc, char **argv)
		{
		struct rlimit r = {10 * 1024 * 1024, RLIM_INFINITY};
		int iov_count = 1, length = 1024, rate = 1;
		struct sockmap_options options = {0};
		int opt, longindex, err, cg_fd = 0;
		char *bpf_file = BPF_FILENAME;
		char *bpf_file = BPF_SOCKMAP_FILENAME;
		int test = PING_PONG;

		if (setrlimit(RLIMIT_MEMLOCK, &r)) {
		@@ -1438,7 +1451,7 @@ int main(int argc, char **argv)
		return -1;
		}

		err = populate_progs();
		err = populate_progs(bpf_file);
		if (err) {
		fprintf(stderr, "populate program: (%s) %s\n",
		bpf_file, strerror(errno));

Admin message