From: Geliang Tang <tanggeliang@kylinos.cn>
After squashing into this change, the patch "selftests/bpf: Add bpf_red
test" can be merged into the patch "selftests/bpf: Add bpf_red scheduler"
appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_red
scheduler, the arguments "1 1" means data has been sent on both
net devices. Run this test by RUN_MPTCP_TEST macro.
'''
And update the subject to "selftests/bpf: Add bpf_red scheduler & test".
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------
1 file changed, 2 insertions(+), 37 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 6b2037ee32ac..1609a0e1e799 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -541,41 +541,7 @@ static void test_##sched(void) \
MPTCP_SCHED_TEST(first, WITH_DATA, WITHOUT_DATA);
MPTCP_SCHED_TEST(bkup, WITH_DATA, WITHOUT_DATA);
MPTCP_SCHED_TEST(rr, WITH_DATA, WITH_DATA);
-
-static void test_red(void)
-{
- struct mptcp_bpf_red *red_skel;
- int server_fd, client_fd;
- struct nstoken *nstoken;
- struct bpf_link *link;
-
- red_skel = mptcp_bpf_red__open_and_load();
- if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load"))
- return;
-
- link = bpf_map__attach_struct_ops(red_skel->maps.red);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- mptcp_bpf_red__destroy(red_skel);
- return;
- }
-
- nstoken = sched_init("subflow", "bpf_red");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_red"))
- 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_red");
- ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1");
- ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2");
-
- close(client_fd);
- close(server_fd);
-fail:
- cleanup_netns(nstoken);
- bpf_link__destroy(link);
- mptcp_bpf_red__destroy(red_skel);
-}
+MPTCP_SCHED_TEST(red, WITH_DATA, WITH_DATA);
static void test_burst(void)
{
@@ -626,8 +592,7 @@ void test_mptcp(void)
RUN_MPTCP_TEST(first);
RUN_MPTCP_TEST(bkup);
RUN_MPTCP_TEST(rr);
- if (test__start_subtest("red"))
- test_red();
+ RUN_MPTCP_TEST(red);
if (test__start_subtest("burst"))
test_burst();
}
--
2.40.1