Commit a87f34e7 authored by Brad Cowie's avatar Brad Cowie Committed by Martin KaFai Lau
Browse files

selftests/bpf: Update tests for new ct zone opts for nf_conntrack kfuncs 



Add test for allocating and looking up ct entry in a
non-default ct zone with kfuncs bpf_{xdp,skb}_ct_alloc
and bpf_{xdp,skb}_ct_lookup.

Add negative tests for looking up ct entry in a different
ct zone to where it was allocated and with a different
direction.

Update reserved test for old struct definition to test for
ct_zone_id being set when opts size isn't NF_BPF_CT_OPTS_SZ (16).

Signed-off-by: default avatarBrad Cowie <brad@faucet.nz>
Link: https://lore.kernel.org/r/20240522050712.732558-2-brad@faucet.nz


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent ece4b296

tools/testing/selftests/bpf/config

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ CONFIG_NETFILTER_XT_TARGET_CT=y 
CONFIG_NETKIT=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_MARK=y

CONFIG_NF_CONNTRACK_ZONES=y

CONFIG_NF_DEFRAG_IPV4=y

CONFIG_NF_DEFRAG_IPV6=y

CONFIG_NF_NAT=y

tools/testing/selftests/bpf/prog_tests/bpf_nf.c

+7 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static void test_bpf_nf_ct(int mode) 


	ASSERT_EQ(skel->bss->test_einval_bpf_tuple, -EINVAL, "Test EINVAL for NULL bpf_tuple");

	ASSERT_EQ(skel->bss->test_einval_reserved, -EINVAL, "Test EINVAL for reserved not set to 0");

	ASSERT_EQ(skel->bss->test_einval_reserved_new, -EINVAL, "Test EINVAL for reserved in new struct not set to 0");

	ASSERT_EQ(skel->bss->test_einval_netns_id, -EINVAL, "Test EINVAL for netns_id < -1");

	ASSERT_EQ(skel->bss->test_einval_len_opts, -EINVAL, "Test EINVAL for len__opts != NF_BPF_CT_OPTS_SZ");

	ASSERT_EQ(skel->bss->test_eproto_l4proto, -EPROTO, "Test EPROTO for l4proto != TCP or UDP");
@@ -122,6 +123,12 @@ static void test_bpf_nf_ct(int mode) 
	ASSERT_EQ(skel->bss->test_exist_lookup_mark, 43, "Test existing connection lookup ctmark");

	ASSERT_EQ(skel->data->test_snat_addr, 0, "Test for source natting");

	ASSERT_EQ(skel->data->test_dnat_addr, 0, "Test for destination natting");

	ASSERT_EQ(skel->data->test_ct_zone_id_alloc_entry, 0, "Test for alloc new entry in specified ct zone");

	ASSERT_EQ(skel->data->test_ct_zone_id_insert_entry, 0, "Test for insert new entry in specified ct zone");

	ASSERT_EQ(skel->data->test_ct_zone_id_succ_lookup, 0, "Test for successful lookup in specified ct_zone");

	ASSERT_EQ(skel->bss->test_ct_zone_dir_enoent_lookup, -ENOENT, "Test ENOENT for lookup with wrong ct zone dir");

	ASSERT_EQ(skel->bss->test_ct_zone_id_enoent_lookup, -ENOENT, "Test ENOENT for lookup in wrong ct zone");



end:

	if (client_fd != -1)

		close(client_fd);

tools/testing/selftests/bpf/progs/test_bpf_nf.c

+108 −0
Original line number Diff line number Diff line
@@ -9,10 +9,14 @@ 
#define EINVAL 22

#define ENOENT 2



#define NF_CT_ZONE_DIR_ORIG (1 << IP_CT_DIR_ORIGINAL)

#define NF_CT_ZONE_DIR_REPL (1 << IP_CT_DIR_REPLY)



extern unsigned long CONFIG_HZ __kconfig;



int test_einval_bpf_tuple = 0;

int test_einval_reserved = 0;

int test_einval_reserved_new = 0;

int test_einval_netns_id = 0;

int test_einval_len_opts = 0;

int test_eproto_l4proto = 0;
@@ -22,6 +26,11 @@ int test_eafnosupport = 0; 
int test_alloc_entry = -EINVAL;

int test_insert_entry = -EAFNOSUPPORT;

int test_succ_lookup = -ENOENT;

int test_ct_zone_id_alloc_entry = -EINVAL;

int test_ct_zone_id_insert_entry = -EAFNOSUPPORT;

int test_ct_zone_id_succ_lookup = -ENOENT;

int test_ct_zone_dir_enoent_lookup = 0;

int test_ct_zone_id_enoent_lookup = 0;

u32 test_delta_timeout = 0;

u32 test_status = 0;

u32 test_insert_lookup_mark = 0;
@@ -45,6 +54,17 @@ struct bpf_ct_opts___local { 
	s32 netns_id;

	s32 error;

	u8 l4proto;

	u8 dir;

	u8 reserved[2];

};



struct bpf_ct_opts___new {

	s32 netns_id;

	s32 error;

	u8 l4proto;

	u8 dir;

	u16 ct_zone_id;

	u8 ct_zone_dir;

	u8 reserved[3];

} __attribute__((preserve_access_index));
@@ -220,10 +240,97 @@ nf_ct_test(struct nf_conn *(*lookup_fn)(void *, struct bpf_sock_tuple *, u32, 
	}

}



static __always_inline void

nf_ct_opts_new_test(struct nf_conn *(*lookup_fn)(void *, struct bpf_sock_tuple *, u32,

						 struct bpf_ct_opts___new *, u32),

		    struct nf_conn *(*alloc_fn)(void *, struct bpf_sock_tuple *, u32,

						struct bpf_ct_opts___new *, u32),

		    void *ctx)

{

	struct bpf_ct_opts___new opts_def = { .l4proto = IPPROTO_TCP, .netns_id = -1 };

	struct bpf_sock_tuple bpf_tuple;

	struct nf_conn *ct;



	__builtin_memset(&bpf_tuple, 0, sizeof(bpf_tuple.ipv4));



	opts_def.reserved[0] = 1;

	ct = lookup_fn(ctx, &bpf_tuple, sizeof(bpf_tuple.ipv4), &opts_def,

		       sizeof(opts_def));

	opts_def.reserved[0] = 0;

	if (ct)

		bpf_ct_release(ct);

	else

		test_einval_reserved_new = opts_def.error;



	bpf_tuple.ipv4.saddr = bpf_get_prandom_u32(); /* src IP */

	bpf_tuple.ipv4.daddr = bpf_get_prandom_u32(); /* dst IP */

	bpf_tuple.ipv4.sport = bpf_get_prandom_u32(); /* src port */

	bpf_tuple.ipv4.dport = bpf_get_prandom_u32(); /* dst port */



	/* use non-default ct zone */

	opts_def.ct_zone_id = 10;

	opts_def.ct_zone_dir = NF_CT_ZONE_DIR_ORIG;

	ct = alloc_fn(ctx, &bpf_tuple, sizeof(bpf_tuple.ipv4), &opts_def,

		      sizeof(opts_def));

	if (ct) {

		__u16 sport = bpf_get_prandom_u32();

		__u16 dport = bpf_get_prandom_u32();

		union nf_inet_addr saddr = {};

		union nf_inet_addr daddr = {};

		struct nf_conn *ct_ins;



		bpf_ct_set_timeout(ct, 10000);



		/* snat */

		saddr.ip = bpf_get_prandom_u32();

		bpf_ct_set_nat_info(ct, &saddr, sport, NF_NAT_MANIP_SRC___local);

		/* dnat */

		daddr.ip = bpf_get_prandom_u32();

		bpf_ct_set_nat_info(ct, &daddr, dport, NF_NAT_MANIP_DST___local);



		ct_ins = bpf_ct_insert_entry(ct);

		if (ct_ins) {

			struct nf_conn *ct_lk;



			/* entry should exist in same ct zone we inserted it */

			ct_lk = lookup_fn(ctx, &bpf_tuple, sizeof(bpf_tuple.ipv4),

					  &opts_def, sizeof(opts_def));

			if (ct_lk) {

				bpf_ct_release(ct_lk);

				test_ct_zone_id_succ_lookup = 0;

			}



			/* entry should not exist with wrong direction */

			opts_def.ct_zone_dir = NF_CT_ZONE_DIR_REPL;

			ct_lk = lookup_fn(ctx, &bpf_tuple, sizeof(bpf_tuple.ipv4),

					  &opts_def, sizeof(opts_def));

			opts_def.ct_zone_dir = NF_CT_ZONE_DIR_ORIG;

			if (ct_lk)

				bpf_ct_release(ct_lk);

			else

				test_ct_zone_dir_enoent_lookup = opts_def.error;



			/* entry should not exist in default ct zone */

			opts_def.ct_zone_id = 0;

			ct_lk = lookup_fn(ctx, &bpf_tuple, sizeof(bpf_tuple.ipv4),

					  &opts_def, sizeof(opts_def));

			if (ct_lk)

				bpf_ct_release(ct_lk);

			else

				test_ct_zone_id_enoent_lookup = opts_def.error;



			bpf_ct_release(ct_ins);

			test_ct_zone_id_insert_entry = 0;

		}

		test_ct_zone_id_alloc_entry = 0;

	}

}



SEC("xdp")

int nf_xdp_ct_test(struct xdp_md *ctx)

{

	nf_ct_test((void *)bpf_xdp_ct_lookup, (void *)bpf_xdp_ct_alloc, ctx);

	nf_ct_opts_new_test((void *)bpf_xdp_ct_lookup, (void *)bpf_xdp_ct_alloc, ctx);

	return 0;

}
@@ -231,6 +338,7 @@ SEC("tc") 
int nf_skb_ct_test(struct __sk_buff *ctx)

{

	nf_ct_test((void *)bpf_skb_ct_lookup, (void *)bpf_skb_ct_alloc, ctx);

	nf_ct_opts_new_test((void *)bpf_skb_ct_lookup, (void *)bpf_skb_ct_alloc, ctx);

	return 0;

}