From: Mat Martineau <martineau@kernel.org>
To: Geliang Tang <geliang@kernel.org>
Cc: mptcp@lists.linux.dev, Geliang Tang <tanggeliang@kylinos.cn>
Subject: Re: [PATCH mptcp-next v8 5/9] Squash to "selftests/bpf: Add bpf_first scheduler & test"
Date: Fri, 12 Apr 2024 16:32:17 -0700 (PDT) [thread overview]
Message-ID: <a13fc562-ad37-5c63-17cd-68ff88170af2@kernel.org> (raw)
In-Reply-To: <3a8e8688d120d18525004dec7d214a901ce8f30c.1712714407.git.tanggeliang@kylinos.cn>
On Wed, 10 Apr 2024, Geliang Tang wrote:
> 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 0144db1425ed..d56a5aa0cf85 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -530,40 +530,7 @@ skel_destroy: \
> mptcp_bpf_##sched##__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, WITH_DATA, WITHOUT_DATA);
>
> static void test_bkup(void)
> {
> @@ -716,8 +683,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 */
Hi Geliang -
Please wait until making a code change within this file before updating
the copyright. This comment also applies to patches 6 through 9.
- Mat
next prev parent reply other threads:[~2024-04-12 23:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 2:05 [PATCH mptcp-next v8 0/9] refactor mptcp bpf tests Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 1/9] selftests/bpf: Add RUN_MPTCP_TEST macro Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 2/9] Squash to "selftests/bpf: Add bpf scheduler test" 1 verify Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 3/9] Squash to "selftests/bpf: Add bpf scheduler test" 2 time Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 4/9] Squash to "selftests/bpf: Add bpf scheduler test" 3 MPTCP_SCHED_TEST Geliang Tang
2024-04-12 23:30 ` Mat Martineau
2024-04-10 2:05 ` [PATCH mptcp-next v8 5/9] Squash to "selftests/bpf: Add bpf_first scheduler & test" Geliang Tang
2024-04-12 23:32 ` Mat Martineau [this message]
2024-04-10 2:05 ` [PATCH mptcp-next v8 6/9] Squash to "selftests/bpf: Add bpf_bkup " Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 7/9] Squash to "selftests/bpf: Add bpf_rr " Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 8/9] Squash to "selftests/bpf: Add bpf_red " Geliang Tang
2024-04-10 2:05 ` [PATCH mptcp-next v8 9/9] Squash to "selftests/bpf: Add bpf_burst " Geliang Tang
2024-04-10 2:52 ` [PATCH mptcp-next v8 0/9] refactor mptcp bpf tests MPTCP CI
2024-04-10 16:50 ` Matthieu Baerts
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=a13fc562-ad37-5c63-17cd-68ff88170af2@kernel.org \
--to=martineau@kernel.org \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).