tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Ihor Solodrai <isolodrai@meta.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20250502185221.1556192-1-isolodrai@meta.com

authored by

Ihor Solodrai and committed by
Andrii Nakryiko a28fe316 f263336a

-67
-67
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c
··· 61 61 return 0; 62 62 } 63 63 64 - static int tcp_server(int family) 65 - { 66 - int err, s; 67 - 68 - s = socket(family, SOCK_STREAM, 0); 69 - if (!ASSERT_GE(s, 0, "socket")) 70 - return -1; 71 - 72 - err = listen(s, SOMAXCONN); 73 - if (!ASSERT_OK(err, "listen")) 74 - return -1; 75 - 76 - return s; 77 - } 78 - 79 - static int disconnect(int fd) 80 - { 81 - struct sockaddr unspec = { AF_UNSPEC }; 82 - 83 - return connect(fd, &unspec, sizeof(unspec)); 84 - } 85 - 86 - /* Disconnect (unhash) a kTLS socket after removing it from sockmap. */ 87 - static void test_sockmap_ktls_disconnect_after_delete(int family, int map) 88 - { 89 - struct sockaddr_storage addr = {0}; 90 - socklen_t len = sizeof(addr); 91 - int err, cli, srv, zero = 0; 92 - 93 - srv = tcp_server(family); 94 - if (srv == -1) 95 - return; 96 - 97 - err = getsockname(srv, (struct sockaddr *)&addr, &len); 98 - if (!ASSERT_OK(err, "getsockopt")) 99 - goto close_srv; 100 - 101 - cli = socket(family, SOCK_STREAM, 0); 102 - if (!ASSERT_GE(cli, 0, "socket")) 103 - goto close_srv; 104 - 105 - err = connect(cli, (struct sockaddr *)&addr, len); 106 - if (!ASSERT_OK(err, "connect")) 107 - goto close_cli; 108 - 109 - err = bpf_map_update_elem(map, &zero, &cli, 0); 110 - if (!ASSERT_OK(err, "bpf_map_update_elem")) 111 - goto close_cli; 112 - 113 - err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls")); 114 - if (!ASSERT_OK(err, "setsockopt(TCP_ULP)")) 115 - goto close_cli; 116 - 117 - err = bpf_map_delete_elem(map, &zero); 118 - if (!ASSERT_OK(err, "bpf_map_delete_elem")) 119 - goto close_cli; 120 - 121 - err = disconnect(cli); 122 - 123 - close_cli: 124 - close(cli); 125 - close_srv: 126 - close(srv); 127 - } 128 - 129 64 static void test_sockmap_ktls_update_fails_when_sock_has_ulp(int family, int map) 130 65 { 131 66 struct sockaddr_storage addr = {}; ··· 248 313 if (!ASSERT_GE(map, 0, "bpf_map_create")) 249 314 return; 250 315 251 - if (test__start_subtest(fmt_test_name("disconnect_after_delete", family, map_type))) 252 - test_sockmap_ktls_disconnect_after_delete(family, map); 253 316 if (test__start_subtest(fmt_test_name("update_fails_when_sock_has_ulp", family, map_type))) 254 317 test_sockmap_ktls_update_fails_when_sock_has_ulp(family, map); 255 318