Commit c88ea16a authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Alexei Starovoitov
Browse files

selftests/bpf: Cover listener cloning with progs attached to sockmap 

Today we test if a child socket is cloned properly from a listening socket
inside a sockmap only when there are no BPF programs attached to the map.

A bug has been reported [1] for the case when sockmap has a verdict program
attached. So cover this case as well to prevent regressions.

[1]: https://lore.kernel.org/r/00000000000073b14905ef2e7401@google.com



Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20230113-sockmap-fix-v2-4-1e0ee7ac2f90@cloudflare.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent b4ea530d

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

+28 −2
Original line number Diff line number Diff line
@@ -563,8 +563,7 @@ static void test_update_existing(struct test_sockmap_listen *skel __always_unuse 
/* Exercise the code path where we destroy child sockets that never

 * got accept()'ed, aka orphans, when parent socket gets closed.

 */

static void test_destroy_orphan_child(struct test_sockmap_listen *skel __always_unused,

				      int family, int sotype, int mapfd)

static void do_destroy_orphan_child(int family, int sotype, int mapfd)

{

	struct sockaddr_storage addr;

	socklen_t len;
@@ -595,6 +594,33 @@ static void test_destroy_orphan_child(struct test_sockmap_listen *skel __always_ 
	xclose(s);

}



static void test_destroy_orphan_child(struct test_sockmap_listen *skel,

				      int family, int sotype, int mapfd)

{

	int msg_verdict = bpf_program__fd(skel->progs.prog_msg_verdict);

	int skb_verdict = bpf_program__fd(skel->progs.prog_skb_verdict);

	const struct test {

		int progfd;

		enum bpf_attach_type atype;

	} tests[] = {

		{ -1, -1 },

		{ msg_verdict, BPF_SK_MSG_VERDICT },

		{ skb_verdict, BPF_SK_SKB_VERDICT },

	};

	const struct test *t;



	for (t = tests; t < tests + ARRAY_SIZE(tests); t++) {

		if (t->progfd != -1 &&

		    xbpf_prog_attach(t->progfd, mapfd, t->atype, 0) != 0)

			return;



		do_destroy_orphan_child(family, sotype, mapfd);



		if (t->progfd != -1)

			xbpf_prog_detach2(t->progfd, mapfd, t->atype);

	}

}



/* Perform a passive open after removing listening socket from SOCKMAP

 * to ensure that callbacks get restored properly.

 */