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
Subject: Re: [PATCH bpf-next 9/9] selftests/bpf: Use netns helpers in test_tunnel
Date: Wed, 15 May 2024 17:00:16 +0800 [thread overview]
Message-ID: <9a207f7b3fc0d915781041a143dfccdd672db68c.camel@kernel.org> (raw)
In-Reply-To: <a1d1035cefdeb675ae561fdb1fd49cddb4ba4bb6.1715751995.git.tanggeliang@kylinos.cn>
Sorry, this patch breaks CI.
Changes Requested.
-Geliang
On Wed, 2024-05-15 at 13:59 +0800, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> This patch uses netns helpers create_netns() and cleanup_netns() in
> test_tunnel.c instead of using open_netns() and close_netns()
> directly.
>
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> .../selftests/bpf/prog_tests/test_tunnel.c | 19 +++++++++--------
> --
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
> b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
> index cec746e77cd3..6706ee1cb36d 100644
> --- a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
> +++ b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
> @@ -102,7 +102,6 @@
>
> static int config_device(void)
> {
> - SYS(fail, "ip netns add at_ns0");
> SYS(fail, "ip link add veth0 address " MAC_VETH1 " type veth
> peer name veth1");
> SYS(fail, "ip link set veth0 netns at_ns0");
> SYS(fail, "ip addr add " IP4_ADDR1_VETH1 "/24 dev veth1");
> @@ -117,7 +116,7 @@ static int config_device(void)
>
> static void cleanup(void)
> {
> - SYS_NOFAIL("test -f /var/run/netns/at_ns0 && ip netns delete
> at_ns0");
> + SYS_NOFAIL("test -f /var/run/netns/at_ns0");
> SYS_NOFAIL("ip link del veth1");
> SYS_NOFAIL("ip link del %s", VXLAN_TUNL_DEV1);
> SYS_NOFAIL("ip link del %s", IP6VXLAN_TUNL_DEV1);
> @@ -444,7 +443,7 @@ static void test_vxlan_tunnel(void)
> goto done;
>
> /* load and attach prog set_md to tunnel dev tc hook point
> at_ns0 */
> - nstoken = open_netns("at_ns0");
> + nstoken = create_netns("at_ns0");
> if (!ASSERT_OK_PTR(nstoken, "setns src"))
> goto done;
> ifindex = if_nametoindex(VXLAN_TUNL_DEV0);
> @@ -456,7 +455,7 @@ static void test_vxlan_tunnel(void)
> goto done;
> if (attach_tc_prog(&tc_hook, -1, set_dst_prog_fd))
> goto done;
> - close_netns(nstoken);
> + cleanup_netns(nstoken);
>
> /* use veth1 ip 2 as tunnel source ip */
> local_ip_map_fd = bpf_map__fd(skel->maps.local_ip_map);
> @@ -517,7 +516,7 @@ static void test_ip6vxlan_tunnel(void)
> goto done;
>
> /* load and attach prog set_md to tunnel dev tc hook point
> at_ns0 */
> - nstoken = open_netns("at_ns0");
> + nstoken = create_netns("at_ns0");
> if (!ASSERT_OK_PTR(nstoken, "setns src"))
> goto done;
> ifindex = if_nametoindex(IP6VXLAN_TUNL_DEV0);
> @@ -529,7 +528,7 @@ static void test_ip6vxlan_tunnel(void)
> goto done;
> if (attach_tc_prog(&tc_hook, -1, set_dst_prog_fd))
> goto done;
> - close_netns(nstoken);
> + cleanup_netns(nstoken);
>
> /* use veth1 ip 2 as tunnel source ip */
> local_ip_map_fd = bpf_map__fd(skel->maps.local_ip_map);
> @@ -611,13 +610,13 @@ static void test_ipip_tunnel(enum ipip_encap
> encap)
> goto done;
>
> /* ping from at_ns0 namespace test */
> - nstoken = open_netns("at_ns0");
> + nstoken = create_netns("at_ns0");
> if (!ASSERT_OK_PTR(nstoken, "setns"))
> goto done;
> err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV1);
> if (!ASSERT_OK(err, "test_ping"))
> goto done;
> - close_netns(nstoken);
> + cleanup_netns(nstoken);
>
> done:
> /* delete ipip tunnel */
> @@ -667,11 +666,11 @@ static void test_xfrm_tunnel(void)
> goto done;
>
> /* ping from at_ns0 namespace test */
> - nstoken = open_netns("at_ns0");
> + nstoken = create_netns("at_ns0");
> if (!ASSERT_OK_PTR(nstoken, "setns"))
> goto done;
> err = test_ping(AF_INET, IP4_ADDR_TUNL_DEV1);
> - close_netns(nstoken);
> + cleanup_netns(nstoken);
> if (!ASSERT_OK(err, "test_ping"))
> goto done;
>
prev parent reply other threads:[~2024-05-15 9: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 ` [PATCH bpf-next 4/9] selftests/bpf: Export create_netns helper Geliang Tang
2024-05-15 5:59 ` [PATCH bpf-next 5/9] selftests/bpf: Use " 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 [this message]
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=9a207f7b3fc0d915781041a143dfccdd672db68c.camel@kernel.org \
--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).