From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <tanggeliang@kylinos.cn>
Subject: [PATCH mptcp-next v9 5/8] Squash to "selftests/bpf: Add bpf_bkup scheduler & test"
Date: Wed, 17 Apr 2024 10:38:51 +0800 [thread overview]
Message-ID: <fc88fcb1ed4a26c6576d1b6d4c5035e98d7be460.1713321357.git.tanggeliang@kylinos.cn> (raw)
In-Reply-To: <cover.1713321357.git.tanggeliang@kylinos.cn>
From: Geliang Tang <tanggeliang@kylinos.cn>
After squashing into this change, the patch "selftests/bpf: Add bpf_bkup
test" can be merged into the patch "selftests/bpf: Add bpf_bkup scheduler"
appending the following lines into commit log:
'''
Using MPTCP_SCHED_TEST macro to add a new test for this bpf_bkup
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_bkup 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 504e00faf9e0..a49328648eca 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -539,41 +539,7 @@ static void test_##sched(void) \
}
MPTCP_SCHED_TEST(first, WITH_DATA, WITHOUT_DATA);
-
-static void test_bkup(void)
-{
- struct mptcp_bpf_bkup *bkup_skel;
- int server_fd, client_fd;
- struct nstoken *nstoken;
- struct bpf_link *link;
-
- bkup_skel = mptcp_bpf_bkup__open_and_load();
- if (!ASSERT_OK_PTR(bkup_skel, "bpf_bkup__open_and_load"))
- return;
-
- link = bpf_map__attach_struct_ops(bkup_skel->maps.bkup);
- if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
- mptcp_bpf_bkup__destroy(bkup_skel);
- return;
- }
-
- nstoken = sched_init("subflow backup", "bpf_bkup");
- if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_bkup"))
- 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_bkup");
- 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_bkup__destroy(bkup_skel);
-}
+MPTCP_SCHED_TEST(bkup, WITH_DATA, WITHOUT_DATA);
static void test_rr(void)
{
@@ -692,8 +658,7 @@ void test_mptcp(void)
RUN_MPTCP_TEST(mptcpify);
RUN_MPTCP_TEST(default);
RUN_MPTCP_TEST(first);
- if (test__start_subtest("bkup"))
- test_bkup();
+ RUN_MPTCP_TEST(bkup);
if (test__start_subtest("rr"))
test_rr();
if (test__start_subtest("red"))
--
2.40.1
next prev parent reply other threads:[~2024-04-17 2:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 2:38 [PATCH mptcp-next v9 0/8] refactor mptcp bpf tests Geliang Tang
2024-04-17 2:38 ` [PATCH mptcp-next v9 1/8] selftests/bpf: Add RUN_MPTCP_TEST macro Geliang Tang
2024-04-18 16:42 ` Mat Martineau
2024-04-17 2:38 ` [PATCH mptcp-next v9 2/8] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify Geliang Tang
2024-04-17 2:38 ` [PATCH mptcp-next v9 3/8] Squash to "selftests/bpf: Add bpf scheduler test" 2 time Geliang Tang
2024-04-17 2:38 ` [PATCH mptcp-next v9 4/8] Squash to "selftests/bpf: Add bpf_first scheduler & test" Geliang Tang
2024-04-18 0:23 ` Mat Martineau
2024-04-17 2:38 ` Geliang Tang [this message]
2024-04-17 2:38 ` [PATCH mptcp-next v9 6/8] Squash to "selftests/bpf: Add bpf_rr " Geliang Tang
2024-04-17 2:38 ` [PATCH mptcp-next v9 7/8] Squash to "selftests/bpf: Add bpf_red " Geliang Tang
2024-04-17 2:38 ` [PATCH mptcp-next v9 8/8] Squash to "selftests/bpf: Add bpf_burst " Geliang Tang
2024-04-17 3:25 ` [PATCH mptcp-next v9 0/8] refactor mptcp bpf tests MPTCP CI
2024-04-19 9:58 ` Matthieu Baerts
2024-04-20 0:18 ` Geliang Tang
2024-04-20 9:12 ` Matthieu Baerts
2024-04-22 7:05 ` Geliang Tang
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=fc88fcb1ed4a26c6576d1b6d4c5035e98d7be460.1713321357.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.