From: Geliang Tang <tanggeliang@kylinos.cn>
Update sockmap tests to reflect new MPTCP support. MPTCP sockets are now
allowed in sockmap, so test expectations are adjusted accordingly.
Use a different key (1) for MPTCP client sockets to validate sockmap.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 7f48fd9e94e1..4806ccb6b502 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -545,11 +545,11 @@ static void test_sockmap_with_mptcp_fallback(struct mptcp_sockmap *skel)
close(listen_fd);
}
-/* Test sockmap rejection of MPTCP sockets - both server and client sides. */
-static void test_sockmap_reject_mptcp(struct mptcp_sockmap *skel)
+/* Test sockmap of MPTCP sockets - both server and client sides. */
+static void test_sockmap_mptcp_support(struct mptcp_sockmap *skel)
{
int listen_fd = -1, server_fd = -1, client_fd1 = -1;
- int err, zero = 0;
+ int err, zero = 0, one = 1;
/* start server with MPTCP enabled */
listen_fd = start_mptcp_server(AF_INET, NULL, 0, 0);
@@ -570,13 +570,13 @@ static void test_sockmap_reject_mptcp(struct mptcp_sockmap *skel)
server_fd = accept(listen_fd, NULL, 0);
err = bpf_map_update_elem(bpf_map__fd(skel->maps.sock_map),
&zero, &server_fd, BPF_NOEXIST);
- if (!ASSERT_EQ(err, -EOPNOTSUPP, "server should be disallowed"))
+ if (!ASSERT_EQ(err, 0, "server should be allowed"))
goto end;
- /* MPTCP client should also be disallowed */
+ /* MPTCP client should also be allowed */
err = bpf_map_update_elem(bpf_map__fd(skel->maps.sock_map),
- &zero, &client_fd1, BPF_NOEXIST);
- if (!ASSERT_EQ(err, -EOPNOTSUPP, "client should be disallowed"))
+ &one, &client_fd1, BPF_NOEXIST);
+ if (!ASSERT_EQ(err, 0, "client should be allowed"))
goto end;
end:
if (client_fd1 >= 0)
@@ -619,7 +619,7 @@ static void test_mptcp_sockmap(void)
goto close_netns;
test_sockmap_with_mptcp_fallback(skel);
- test_sockmap_reject_mptcp(skel);
+ test_sockmap_mptcp_support(skel);
close_netns:
netns_free(netns);
--
2.51.0