Enable INET_XFRM_TUNNEL in config
Subsystems (3)
v2 cover Enable INET_XFRM_TUNNEL in config
From: Geliang Tang <[email protected]>
v2:
- resend patch 1.
- another fix for test_tunnel.
Geliang Tang (2):
selftests/bpf: Enable INET_XFRM_TUNNEL in config selftests/bpf: Close netns in error paths in test_tunnel
tools/testing/selftests/bpf/config | 4 +++ .../selftests/bpf/prog_tests/test_tunnel.c | 27 +++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/2 selftests/bpf: Enable INET_XFRM_TUNNEL in config
From: Geliang Tang <[email protected]>
The kconfigs CONFIG_INET_XFRM_TUNNEL and CONFIG_INET6_XFRM_TUNNEL are needed by test_tunnel tests. This patch enables them together with the dependent kconfigs CONFIG_INET_IPCOMP and CONFIG_INET6_IPCOMP.
--- tools/testing/selftests/bpf/config | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/bpf/config +4 -0
@@ -96,3 +96,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_XFRM_INTERFACE=y CONFIG_TCP_CONG_DCTCP=y CONFIG_TCP_CONG_BBR=y +CONFIG_INET_IPCOMP=y +CONFIG_INET_XFRM_TUNNEL=y +CONFIG_INET6_IPCOMP=y +CONFIG_INET6_XFRM_TUNNEL=y
Signature · 1 line
2.43.0
PATCH v2 2/2 selftests/bpf: Close netns in error paths in test_tunnel
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
netns created by open_netns() should be closed in error paths in test_vxlan_tunnel(), test_ip6vxlan_tunnel() and test_ipip_tunnel().
--- .../selftests/bpf/prog_tests/test_tunnel.c | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-)
tools/testing/selftests/bpf/prog_tests/test_tunnel.c +19 -8
@@ -448,14 +448,20 @@ static void test_vxlan_tunnel(void)if (!ASSERT_OK_PTR (nstoken,"setns src" )) goto done; ifindex =if_nametoindex (VXLAN_TUNL_DEV0 ); -if (!ASSERT_NEQ (ifindex,0 ,"vxlan00 ifindex" )) +if (!ASSERT_NEQ (ifindex,0 ,"vxlan00 ifindex" )) { +close_netns (nstoken); goto done; + } tc_hook.ifindex = ifindex; set_dst_prog_fd =bpf_program__fd (skel->progs.vxlan_set_tunnel_dst); -if (!ASSERT_GE (set_dst_prog_fd,0 ,"bpf_program__fd" )) +if (!ASSERT_GE (set_dst_prog_fd,0 ,"bpf_program__fd" )) { +close_netns (nstoken); goto done; -if (attach_tc_prog (&tc_hook,-1 , set_dst_prog_fd)) + } +if (attach_tc_prog (&tc_hook,-1 , set_dst_prog_fd)) { +close_netns (nstoken); goto done; + }close_netns (nstoken);/* use veth1 ip 2 as tunnel source ip */
@@ -521,14 +527,20 @@ static void test_ip6vxlan_tunnel(void)if (!ASSERT_OK_PTR (nstoken,"setns src" )) goto done; ifindex =if_nametoindex (IP6VXLAN_TUNL_DEV0 ); -if (!ASSERT_NEQ (ifindex,0 ,"ip6vxlan00 ifindex" )) +if (!ASSERT_NEQ (ifindex,0 ,"ip6vxlan00 ifindex" )) { +close_netns (nstoken); goto done; + } tc_hook.ifindex = ifindex; set_dst_prog_fd =bpf_program__fd (skel->progs.ip6vxlan_set_tunnel_dst); -if (!ASSERT_GE (set_dst_prog_fd,0 ,"bpf_program__fd" )) +if (!ASSERT_GE (set_dst_prog_fd,0 ,"bpf_program__fd" )) { +close_netns (nstoken); goto done; -if (attach_tc_prog (&tc_hook,-1 , set_dst_prog_fd)) + } +if (attach_tc_prog (&tc_hook,-1 , set_dst_prog_fd)) { +close_netns (nstoken); goto done; + }close_netns (nstoken);/* use veth1 ip 2 as tunnel source ip */
@@ -615,8 +627,7 @@ static void test_ipip_tunnel(enum ipip_encap encap)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; +ASSERT_OK (err,"test_ping" );close_netns (nstoken); done:
Signature · 1 line
2.43.0