* [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns
@ 2023-02-17 8:26 Hangbin Liu
2023-02-17 11:19 ` Larysa Zaremba
2023-02-17 13:53 ` Matthieu Baerts
0 siblings, 2 replies; 3+ messages in thread
From: Hangbin Liu @ 2023-02-17 8:26 UTC (permalink / raw)
To: netdev
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, bpf,
Jakub Kicinski, David S . Miller, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Mykola Lysenko, Felix Maurer, Matthieu Baerts,
Hangbin Liu
The current mptcp test is run in init netns. If the user or default
system config disabled mptcp, the test will fail. Let's run the mptcp
test in a dedicated netns to avoid none kernel default mptcp setting.
Suggested-by: Martin KaFai Lau <martin.lau@linux.dev>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
---
.../testing/selftests/bpf/prog_tests/mptcp.c | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 59f08d6d1d53..8a4ed9510ec7 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -7,6 +7,16 @@
#include "network_helpers.h"
#include "mptcp_sock.skel.h"
+#define SYS(fmt, ...) \
+ ({ \
+ char cmd[1024]; \
+ snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__); \
+ if (!ASSERT_OK(system(cmd), cmd)) \
+ goto cmd_fail; \
+ })
+
+#define NS_TEST "mptcp_ns"
+
#ifndef TCP_CA_NAME_MAX
#define TCP_CA_NAME_MAX 16
#endif
@@ -138,12 +148,20 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
static void test_base(void)
{
+ struct nstoken *nstoken = NULL;
int server_fd, cgroup_fd;
cgroup_fd = test__join_cgroup("/mptcp");
if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
return;
+ SYS("ip netns add %s", NS_TEST);
+ SYS("ip -net %s link set dev lo up", NS_TEST);
+
+ nstoken = open_netns(NS_TEST);
+ if (!ASSERT_OK_PTR(nstoken, "open_netns"))
+ goto cmd_fail;
+
/* without MPTCP */
server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
if (!ASSERT_GE(server_fd, 0, "start_server"))
@@ -163,6 +181,12 @@ static void test_base(void)
close(server_fd);
+cmd_fail:
+ if (nstoken)
+ close_netns(nstoken);
+
+ system("ip netns del " NS_TEST " >& /dev/null");
+
close_cgroup_fd:
close(cgroup_fd);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns
2023-02-17 8:26 [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns Hangbin Liu
@ 2023-02-17 11:19 ` Larysa Zaremba
2023-02-17 13:53 ` Matthieu Baerts
1 sibling, 0 replies; 3+ messages in thread
From: Larysa Zaremba @ 2023-02-17 11:19 UTC (permalink / raw)
To: Hangbin Liu
Cc: netdev, Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, bpf,
Jakub Kicinski, David S . Miller, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Mykola Lysenko, Felix Maurer, Matthieu Baerts
On Fri, Feb 17, 2023 at 04:26:07PM +0800, Hangbin Liu wrote:
> The current mptcp test is run in init netns. If the user or default
> system config disabled mptcp, the test will fail. Let's run the mptcp
> test in a dedicated netns to avoid none kernel default mptcp setting.
>
> Suggested-by: Martin KaFai Lau <martin.lau@linux.dev>
Reviewed-by: Larysa Zaremba <larysa.zaremba@intel.com>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---
> .../testing/selftests/bpf/prog_tests/mptcp.c | 24 +++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 59f08d6d1d53..8a4ed9510ec7 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -7,6 +7,16 @@
> #include "network_helpers.h"
> #include "mptcp_sock.skel.h"
>
> +#define SYS(fmt, ...) \
> + ({ \
> + char cmd[1024]; \
> + snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__); \
> + if (!ASSERT_OK(system(cmd), cmd)) \
> + goto cmd_fail; \
> + })
> +
> +#define NS_TEST "mptcp_ns"
> +
> #ifndef TCP_CA_NAME_MAX
> #define TCP_CA_NAME_MAX 16
> #endif
> @@ -138,12 +148,20 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
>
> static void test_base(void)
> {
> + struct nstoken *nstoken = NULL;
> int server_fd, cgroup_fd;
>
> cgroup_fd = test__join_cgroup("/mptcp");
> if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
> return;
>
> + SYS("ip netns add %s", NS_TEST);
> + SYS("ip -net %s link set dev lo up", NS_TEST);
> +
> + nstoken = open_netns(NS_TEST);
> + if (!ASSERT_OK_PTR(nstoken, "open_netns"))
> + goto cmd_fail;
> +
> /* without MPTCP */
> server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
> if (!ASSERT_GE(server_fd, 0, "start_server"))
> @@ -163,6 +181,12 @@ static void test_base(void)
>
> close(server_fd);
>
> +cmd_fail:
> + if (nstoken)
> + close_netns(nstoken);
> +
> + system("ip netns del " NS_TEST " >& /dev/null");
> +
> close_cgroup_fd:
> close(cgroup_fd);
> }
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns
2023-02-17 8:26 [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns Hangbin Liu
2023-02-17 11:19 ` Larysa Zaremba
@ 2023-02-17 13:53 ` Matthieu Baerts
1 sibling, 0 replies; 3+ messages in thread
From: Matthieu Baerts @ 2023-02-17 13:53 UTC (permalink / raw)
To: Hangbin Liu, netdev
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, bpf,
Jakub Kicinski, David S . Miller, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Mykola Lysenko, Felix Maurer, MPTCP Upstream
Hi Hangbin,
(+cc MPTCP ML)
On 17/02/2023 09:26, Hangbin Liu wrote:
> The current mptcp test is run in init netns. If the user or default
> system config disabled mptcp, the test will fail. Let's run the mptcp
> test in a dedicated netns to avoid none kernel default mptcp setting.
Thank you for the patch!
I just have one request below if you don't mind:
(...)
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 59f08d6d1d53..8a4ed9510ec7 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
(...)
> @@ -138,12 +148,20 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
>
> static void test_base(void)
> {
> + struct nstoken *nstoken = NULL;
> int server_fd, cgroup_fd;
>
> cgroup_fd = test__join_cgroup("/mptcp");
> if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
> return;
>
> + SYS("ip netns add %s", NS_TEST);
> + SYS("ip -net %s link set dev lo up", NS_TEST);
> +
> + nstoken = open_netns(NS_TEST);
> + if (!ASSERT_OK_PTR(nstoken, "open_netns"))
> + goto cmd_fail;
> +
> /* without MPTCP */
> server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
> if (!ASSERT_GE(server_fd, 0, "start_server"))
> @@ -163,6 +181,12 @@ static void test_base(void)
>
> close(server_fd);
>
> +cmd_fail:
> + if (nstoken)
> + close_netns(nstoken);
> +
> + system("ip netns del " NS_TEST " >& /dev/null");
> +
> close_cgroup_fd:
If I'm not mistaken, this label should no longer be needed: after the
modification you did, the only 'goto close_cgroup_fd' used above should
be replaced by 'goto cmd_fail', no?
Apart from that, the rest looks good to me.
Cheers,
Matt
> close(cgroup_fd);
> }
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-17 13:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-17 8:26 [PATCH bpf-next] selftests/bpf: run mptcp in a dedicated netns Hangbin Liu
2023-02-17 11:19 ` Larysa Zaremba
2023-02-17 13:53 ` Matthieu Baerts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox