From: Geliang Tang <tanggeliang@kylinos.cn>
After squashing into this change, the patch "selftests/bpf: Add bpf_first
test" can be merged into the patch "selftests/bpf: Add bpf_first scheduler"
appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_first
scheduler, the arguments "1 0" means data has been only sent on the
first subflow ADDR1. Run this test by RUN_MPTCP_TEST macro.
'''
And update the subject to "selftests/bpf: Add bpf_first scheduler & test".
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../testing/selftests/bpf/prog_tests/mptcp.c | 38 +------------------
.../selftests/bpf/progs/mptcp_bpf_first.c | 1 +
2 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index d6653ce1fc36..4bd24bb3d141 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -526,40 +526,7 @@ fail: \
mptcp_bpf_##name##__destroy(skel); \
}
-static void test_first(void)
-{
- struct mptcp_bpf_first *first_skel;
- int server_fd, client_fd;
- struct nstoken *nstoken;
- struct bpf_link *link;
-
- first_skel = mptcp_bpf_first__open_and_load();
- if (!ASSERT_OK_PTR(first_skel, "bpf_first__open_and_load"))
- return;
-
- link = bpf_map__attach_struct_ops(first_skel->maps.first);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- mptcp_bpf_first__destroy(first_skel);
- return;
- }
-
- nstoken = sched_init("subflow", "bpf_first");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_first"))
- goto fail;
- server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
- client_fd = connect_to_fd(server_fd, 0);
-
- send_data(server_fd, client_fd, "bpf_first");
- ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1");
- ASSERT_GT(has_bytes_sent(ADDR_2), 0, "has_bytes_sent addr_2");
-
- close(client_fd);
- close(server_fd);
-fail:
- cleanup_netns(nstoken);
- bpf_link__destroy(link);
- mptcp_bpf_first__destroy(first_skel);
-}
+MPTCP_SCHED_TEST(first, 1, 0);
static void test_bkup(void)
{
@@ -712,8 +679,7 @@ void test_mptcp(void)
RUN_MPTCP_TEST(base);
RUN_MPTCP_TEST(mptcpify);
RUN_MPTCP_TEST(default);
- if (test__start_subtest("first"))
- test_first();
+ RUN_MPTCP_TEST(first);
if (test__start_subtest("bkup"))
test_bkup();
if (test__start_subtest("rr"))
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
index 23a3e8e69e8f..2d067b25d60b 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2022, SUSE. */
+/* Copyright (c) 2024, Kylin Software */
#include <linux/bpf.h>
#include "bpf_tcp_helpers.h"
--
2.40.1