| Message ID | a1d1035cefdeb675ae561fdb1fd49cddb4ba4bb6.1715751995.git.tanggeliang@kylinos.cn |
|---|---|
| State | New |
| Headers | show |
| Series | add netns helpers | expand |
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; >
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;