From: Geliang Tang <geliang@kernel.org>
To: Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>
Cc: Geliang Tang <tanggeliang@kylinos.cn>,
bpf@vger.kernel.org, mptcp@lists.linux.dev,
linux-kselftest@vger.kernel.org,
Geliang Tang <geliang@kernel.org>
Subject: [PATCH bpf-next 4/9] selftests/bpf: Export create_netns helper
Date: Wed, 15 May 2024 13:59:31 +0800 [thread overview]
Message-ID: <659d1fe7e47b6c63f9648cf7c2433e29dadf458f.1715751995.git.tanggeliang@kylinos.cn> (raw)
In-Reply-To: <cover.1715751995.git.tanggeliang@kylinos.cn>
From: Geliang Tang <tanggeliang@kylinos.cn>
This patch moves create_netns() from mptcp.c into network_helpers.c, and
export it in network_helpers.h as a public helper.
The new helper accepts a string parameter, and uses SYS_NOFAIL() instead
of SYS() to execute the command, since SYS() deponds on test__fail()
which is defined in test_progs.c. SYS() is not suitable to be used in
network_helpers.c.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/network_helpers.c | 27 +++++++++++++++++++
tools/testing/selftests/bpf/network_helpers.h | 1 +
.../testing/selftests/bpf/prog_tests/mptcp.c | 14 ++--------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 919bb2a0c6a6..c115aeca0a66 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -498,6 +498,33 @@ void close_netns(struct nstoken *token)
free(token);
}
+struct nstoken *create_netns(const char *name)
+{
+ struct nstoken *token = NULL;
+
+ if (SYS_NOFAIL("ip netns add %s", name)) {
+ log_err("add netns %s failed", name);
+ goto fail;
+ }
+
+ if (SYS_NOFAIL("ip -net %s link set dev lo up", name)) {
+ log_err("set dev lo up failed");
+ goto fail;
+ }
+
+ token = open_netns(name);
+ if (!token) {
+ log_err("open netns %s failed", name);
+ goto fail;
+ }
+
+ return token;
+
+fail:
+ SYS_NOFAIL("ip netns del %s", name);
+ return NULL;
+}
+
int get_socket_local_port(int sock_fd)
{
struct sockaddr_storage addr;
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index b087330f2861..5c0b082153fd 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -81,6 +81,7 @@ struct nstoken;
*/
struct nstoken *open_netns(const char *name);
void close_netns(struct nstoken *token);
+struct nstoken *create_netns(const char *name);
int send_recv_data(int lfd, int fd, uint32_t total_bytes);
int unshare_netns(void);
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 793b4b9c2bd2..ae42ae41f4b4 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -79,16 +79,6 @@ struct mptcp_storage {
char ca_name[TCP_CA_NAME_MAX];
};
-static struct nstoken *create_netns(void)
-{
- SYS(fail, "ip netns add %s", NS_TEST);
- SYS(fail, "ip -net %s link set dev lo up", NS_TEST);
-
- return open_netns(NS_TEST);
-fail:
- return NULL;
-}
-
static void cleanup_netns(struct nstoken *nstoken)
{
if (nstoken)
@@ -228,7 +218,7 @@ static void test_base(void)
if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
return;
- nstoken = create_netns();
+ nstoken = create_netns(NS_TEST);
if (!ASSERT_OK_PTR(nstoken, "create_netns"))
goto fail;
@@ -344,7 +334,7 @@ static void test_mptcpify(void)
if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
return;
- nstoken = create_netns();
+ nstoken = create_netns(NS_TEST);
if (!ASSERT_OK_PTR(nstoken, "create_netns"))
goto fail;
--
2.43.0
next prev parent reply other threads:[~2024-05-15 6:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 5:59 [PATCH bpf-next 0/9] add netns helpers Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 1/9] selftests/bpf: Add unshare_netns helper Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 2/9] selftests/bpf: Use " Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 3/9] selftests/bpf: Drop duplicate create_netns Geliang Tang
2024-05-15 5:59 ` Geliang Tang [this message]
2024-05-15 5:59 ` [PATCH bpf-next 5/9] selftests/bpf: Use create_netns helper Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 6/9] selftests/bpf: Export cleanup_netns helper Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 7/9] selftests/bpf: Use " Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 8/9] selftests/bpf: Use netns helpers in lwt tests Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 9/9] selftests/bpf: Use netns helpers in test_tunnel Geliang Tang
2024-05-15 9:00 ` 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=659d1fe7e47b6c63f9648cf7c2433e29dadf458f.1715751995.git.tanggeliang@kylinos.cn \
--to=geliang@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mptcp@lists.linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=tanggeliang@kylinos.cn \
--cc=yonghong.song@linux.dev \
/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 NNTP newsgroup(s).