From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH mptcp-next 10/11] Squash to "selftests/bpf: Add bpf_red test"
Date: Thu, 28 Mar 2024 17:50:07 +0800 [thread overview]
Message-ID: <bb18e87b1917f4269e82164880153c174485e16e.1711619108.git.tanggeliang@kylinos.cn> (raw)
In-Reply-To: <cover.1711619108.git.tanggeliang@kylinos.cn>
From: Geliang Tang <tanggeliang@kylinos.cn>
Use MPTCP_SCHED_TEST and RUN_MPTCP_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 8f41007fc3b4..572b6e5caa32 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -504,41 +504,7 @@ fail: \
MPTCP_SCHED_TEST(first, 1, 0);
MPTCP_SCHED_TEST(bkup, 1, 0);
MPTCP_SCHED_TEST(rr, 1, 1);
-
-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, 1, 1);
static void test_burst(void)
{
@@ -589,8 +555,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
next prev parent reply other threads:[~2024-03-28 9:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 9:49 [PATCH mptcp-next 00/11] refactor mptcp bpf tests Geliang Tang
2024-03-28 9:49 ` [PATCH mptcp-next 01/11] Squash to "selftests/bpf: Add bpf scheduler test" - fix Geliang Tang
2024-03-28 9:49 ` [PATCH mptcp-next 02/11] selftests/bpf: Refactor mptcp_sock test Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 03/11] selftests/bpf: Refactor mptcpify test Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 04/11] selftests/bpf: Add MPTCP_BASE_TEST macro Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 05/11] selftests/bpf: Add RUN_MPTCP_TEST macro Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 06/11] Squash to "selftests/bpf: Add bpf scheduler test" Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 07/11] Squash to "selftests/bpf: Add bpf_first test" Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 08/11] Squash to "selftests/bpf: Add bpf_bkup test" Geliang Tang
2024-03-28 9:50 ` [PATCH mptcp-next 09/11] Squash to "selftests/bpf: Add bpf_rr test" Geliang Tang
2024-03-28 9:50 ` Geliang Tang [this message]
2024-03-28 9:50 ` [PATCH mptcp-next 11/11] Squash to "selftests/bpf: Add bpf_burst test" Geliang Tang
2024-03-28 10:40 ` [PATCH mptcp-next 00/11] refactor mptcp bpf tests MPTCP CI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bb18e87b1917f4269e82164880153c174485e16e.1711619108.git.tanggeliang@kylinos.cn \
--to=geliang@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=tanggeliang@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.