Commit 9266e49d authored by Michal Luczaj's avatar Michal Luczaj Committed by Martin KaFai Lau
Browse files

selftests/bpf: sockmap_listen cleanup: Drop af_vsock redir tests 



Remove tests covered by sockmap_redir.

Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/r/20250515-selftests-sockmap-redir-v3-6-a1ea723f7e7e@rbox.co
parent f0709263

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

+0 −112
Original line number Diff line number Diff line
@@ -1487,116 +1487,6 @@ static void test_unix_redir(struct test_sockmap_listen *skel, struct bpf_map *ma 
	unix_skb_redir_to_connected(skel, map, sotype);

}



/* Returns two connected loopback vsock sockets */

static int vsock_socketpair_connectible(int sotype, int *v0, int *v1)

{

	return create_pair(AF_VSOCK, sotype | SOCK_NONBLOCK, v0, v1);

}



static void vsock_unix_redir_connectible(int sock_mapfd, int verd_mapfd,

					 enum redir_mode mode, int sotype)

{

	const char *log_prefix = redir_mode_str(mode);

	char a = 'a', b = 'b';

	int u0, u1, v0, v1;

	int sfd[2];

	unsigned int pass;

	int err, n;

	u32 key;



	zero_verdict_count(verd_mapfd);



	if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, sfd))

		return;



	u0 = sfd[0];

	u1 = sfd[1];



	err = vsock_socketpair_connectible(sotype, &v0, &v1);

	if (err) {

		FAIL("vsock_socketpair_connectible() failed");

		goto close_uds;

	}



	err = add_to_sockmap(sock_mapfd, u0, v0);

	if (err) {

		FAIL("add_to_sockmap failed");

		goto close_vsock;

	}



	n = write(v1, &a, sizeof(a));

	if (n < 0)

		FAIL_ERRNO("%s: write", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete write", log_prefix);

	if (n < 1)

		goto out;



	n = xrecv_nonblock(mode == REDIR_INGRESS ? u0 : u1, &b, sizeof(b), 0);

	if (n < 0)

		FAIL("%s: recv() err, errno=%d", log_prefix, errno);

	if (n == 0)

		FAIL("%s: incomplete recv", log_prefix);

	if (b != a)

		FAIL("%s: vsock socket map failed, %c != %c", log_prefix, a, b);



	key = SK_PASS;

	err = xbpf_map_lookup_elem(verd_mapfd, &key, &pass);

	if (err)

		goto out;

	if (pass != 1)

		FAIL("%s: want pass count 1, have %d", log_prefix, pass);

out:

	key = 0;

	bpf_map_delete_elem(sock_mapfd, &key);

	key = 1;

	bpf_map_delete_elem(sock_mapfd, &key);



close_vsock:

	close(v0);

	close(v1);



close_uds:

	close(u0);

	close(u1);

}



static void vsock_unix_skb_redir_connectible(struct test_sockmap_listen *skel,

					     struct bpf_map *inner_map,

					     int sotype)

{

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

	int verdict_map = bpf_map__fd(skel->maps.verdict_map);

	int sock_map = bpf_map__fd(inner_map);

	int err;



	err = xbpf_prog_attach(verdict, sock_map, BPF_SK_SKB_VERDICT, 0);

	if (err)

		return;



	skel->bss->test_ingress = false;

	vsock_unix_redir_connectible(sock_map, verdict_map, REDIR_EGRESS, sotype);

	skel->bss->test_ingress = true;

	vsock_unix_redir_connectible(sock_map, verdict_map, REDIR_INGRESS, sotype);



	xbpf_prog_detach2(verdict, sock_map, BPF_SK_SKB_VERDICT);

}



static void test_vsock_redir(struct test_sockmap_listen *skel, struct bpf_map *map)

{

	const char *family_name, *map_name;

	char s[MAX_TEST_NAME];



	family_name = family_str(AF_VSOCK);

	map_name = map_type_str(map);

	snprintf(s, sizeof(s), "%s %s %s", map_name, family_name, __func__);

	if (!test__start_subtest(s))

		return;



	vsock_unix_skb_redir_connectible(skel, map, SOCK_STREAM);

	vsock_unix_skb_redir_connectible(skel, map, SOCK_SEQPACKET);

}



static void test_reuseport(struct test_sockmap_listen *skel,

			   struct bpf_map *map, int family, int sotype)

{
@@ -1882,14 +1772,12 @@ void serial_test_sockmap_listen(void) 
	run_tests(skel, skel->maps.sock_map, AF_INET6);

	test_unix_redir(skel, skel->maps.sock_map, SOCK_DGRAM);

	test_unix_redir(skel, skel->maps.sock_map, SOCK_STREAM);

	test_vsock_redir(skel, skel->maps.sock_map);



	skel->bss->test_sockmap = false;

	run_tests(skel, skel->maps.sock_hash, AF_INET);

	run_tests(skel, skel->maps.sock_hash, AF_INET6);

	test_unix_redir(skel, skel->maps.sock_hash, SOCK_DGRAM);

	test_unix_redir(skel, skel->maps.sock_hash, SOCK_STREAM);

	test_vsock_redir(skel, skel->maps.sock_hash);



	test_sockmap_listen__destroy(skel);

}