Commit a28fe316 authored by Ihor Solodrai's avatar Ihor Solodrai Committed by Andrii Nakryiko
Browse files

selftests/bpf: Remove sockmap_ktls disconnect_after_delete test 

"sockmap_ktls disconnect_after_delete" is effectively moot after
disconnect has been disabled for TLS [1][2]. Remove the test
completely.

[1] https://lore.kernel.org/bpf/20250416170246.2438524-1-ihor.solodrai@linux.dev/
[2] https://lore.kernel.org/netdev/20250404180334.3224206-1-kuba@kernel.org/



Signed-off-by: default avatarIhor Solodrai <isolodrai@meta.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250502185221.1556192-1-isolodrai@meta.com
parent f263336a

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

+0 −67
Original line number Diff line number Diff line
@@ -61,71 +61,6 @@ static int create_ktls_pairs(int family, int sotype, int *c, int *p) 
	return 0;

}



static int tcp_server(int family)

{

	int err, s;



	s = socket(family, SOCK_STREAM, 0);

	if (!ASSERT_GE(s, 0, "socket"))

		return -1;



	err = listen(s, SOMAXCONN);

	if (!ASSERT_OK(err, "listen"))

		return -1;



	return s;

}



static int disconnect(int fd)

{

	struct sockaddr unspec = { AF_UNSPEC };



	return connect(fd, &unspec, sizeof(unspec));

}



/* Disconnect (unhash) a kTLS socket after removing it from sockmap. */

static void test_sockmap_ktls_disconnect_after_delete(int family, int map)

{

	struct sockaddr_storage addr = {0};

	socklen_t len = sizeof(addr);

	int err, cli, srv, zero = 0;



	srv = tcp_server(family);

	if (srv == -1)

		return;



	err = getsockname(srv, (struct sockaddr *)&addr, &len);

	if (!ASSERT_OK(err, "getsockopt"))

		goto close_srv;



	cli = socket(family, SOCK_STREAM, 0);

	if (!ASSERT_GE(cli, 0, "socket"))

		goto close_srv;



	err = connect(cli, (struct sockaddr *)&addr, len);

	if (!ASSERT_OK(err, "connect"))

		goto close_cli;



	err = bpf_map_update_elem(map, &zero, &cli, 0);

	if (!ASSERT_OK(err, "bpf_map_update_elem"))

		goto close_cli;



	err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));

	if (!ASSERT_OK(err, "setsockopt(TCP_ULP)"))

		goto close_cli;



	err = bpf_map_delete_elem(map, &zero);

	if (!ASSERT_OK(err, "bpf_map_delete_elem"))

		goto close_cli;



	err = disconnect(cli);



close_cli:

	close(cli);

close_srv:

	close(srv);

}



static void test_sockmap_ktls_update_fails_when_sock_has_ulp(int family, int map)

{

	struct sockaddr_storage addr = {};
@@ -313,8 +248,6 @@ static void run_tests(int family, enum bpf_map_type map_type) 
	if (!ASSERT_GE(map, 0, "bpf_map_create"))

		return;



	if (test__start_subtest(fmt_test_name("disconnect_after_delete", family, map_type)))

		test_sockmap_ktls_disconnect_after_delete(family, map);

	if (test__start_subtest(fmt_test_name("update_fails_when_sock_has_ulp", family, map_type)))

		test_sockmap_ktls_update_fails_when_sock_has_ulp(family, map);