Squash to "selftests/bpf: Add bpf_red test"

[PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf_red test"

Posted by Geliang Tang 6 months, 3 weeks ago

From: Matthieu Baerts <matthieu.baerts@tessares.net>

Run mptcp sched test in a dedicated netns.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index f0f9aa517ec1..83af690facef 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -376,7 +376,7 @@ static void test_rr(char *ns)
 	mptcp_bpf_rr__destroy(rr_skel);
 }
 
-static void test_red(void)
+static void test_red(char *ns)
 {
 	struct mptcp_bpf_red *red_skel;
 	int server_fd, client_fd;
@@ -392,17 +392,17 @@ static void test_red(void)
 		return;
 	}
 
-	sched_init("subflow", "bpf_red");
+	sched_init(ns, "subflow", "bpf_red");
 	server_fd = start_mptcp_server(AF_INET, ADDR_1, 0, 0);
 	client_fd = connect_to_fd(server_fd, 0);
 
 	send_data(server_fd, client_fd);
-	ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1");
-	ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2");
+	ASSERT_OK(has_bytes_sent(ns, ADDR_1), "has_bytes_sent addr 1");
+	ASSERT_OK(has_bytes_sent(ns, ADDR_2), "has_bytes_sent addr 2");
 
 	close(client_fd);
 	close(server_fd);
-	sched_cleanup();
+	sched_cleanup(ns);
 	bpf_link__destroy(link);
 	mptcp_bpf_red__destroy(red_skel);
 }
@@ -430,7 +430,7 @@ void test_mptcp(void)
 	if (test__start_subtest("rr"))
 		test_rr(NS_TEST);
 	if (test__start_subtest("red"))
-		test_red();
+		test_red(NS_TEST);
 
 	if (nstoken)
 		close_netns(nstoken);
-- 
2.35.3

Re: [PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf_red test"

Posted by Geliang Tang 6 months, 3 weeks ago

Geliang Tang <geliang.tang@suse.com> 于2023年5月17日周三 16:41写道：
>
> From: Matthieu Baerts <matthieu.baerts@tessares.net>

Sorry, my bad. This line shouldn't be here:)

>
> Run mptcp sched test in a dedicated netns.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
>  tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index f0f9aa517ec1..83af690facef 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -376,7 +376,7 @@ static void test_rr(char *ns)
>         mptcp_bpf_rr__destroy(rr_skel);
>  }
>
> -static void test_red(void)
> +static void test_red(char *ns)
>  {
>         struct mptcp_bpf_red *red_skel;
>         int server_fd, client_fd;
> @@ -392,17 +392,17 @@ static void test_red(void)
>                 return;
>         }
>
> -       sched_init("subflow", "bpf_red");
> +       sched_init(ns, "subflow", "bpf_red");
>         server_fd = start_mptcp_server(AF_INET, ADDR_1, 0, 0);
>         client_fd = connect_to_fd(server_fd, 0);
>
>         send_data(server_fd, client_fd);
> -       ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1");
> -       ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2");
> +       ASSERT_OK(has_bytes_sent(ns, ADDR_1), "has_bytes_sent addr 1");
> +       ASSERT_OK(has_bytes_sent(ns, ADDR_2), "has_bytes_sent addr 2");
>
>         close(client_fd);
>         close(server_fd);
> -       sched_cleanup();
> +       sched_cleanup(ns);
>         bpf_link__destroy(link);
>         mptcp_bpf_red__destroy(red_skel);
>  }
> @@ -430,7 +430,7 @@ void test_mptcp(void)
>         if (test__start_subtest("rr"))
>                 test_rr(NS_TEST);
>         if (test__start_subtest("red"))
> -               test_red();
> +               test_red(NS_TEST);
>
>         if (nstoken)
>                 close_netns(nstoken);
> --
> 2.35.3
>
>