diff mbox series

[bpf-next,9/9] selftests/bpf: Use netns helpers in test_tunnel

Message ID a1d1035cefdeb675ae561fdb1fd49cddb4ba4bb6.1715751995.git.tanggeliang@kylinos.cn (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series add netns helpers | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 fail Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 fail Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 fail Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 fail Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 fail Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-32 fail Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 fail Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 fail Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 fail Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-PR fail PR summary
bpf/vmtest-bpf-next-VM_Test-14 fail Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-8 fail Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 1 maintainers not CCed: dxu@dxuuu.xyz
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 75 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Geliang Tang May 15, 2024, 5:59 a.m. UTC 
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(-)

Comments

Geliang Tang May 15, 2024, 9 a.m. UTC | #1 
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 mbox series

Patch

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;