add netns helpers
Subsystems (5)
Geliang Tang
reviewercover add netns helpers
From: Geliang Tang <[email protected]>
This patchset addresses Alexei's comment for commit "Handle SIGINT when creating netns" [1]. Export local helpers create_netns() and cleanup_netns() defined in mptcp.c into network_helpers.c as generic ones. For this another helper unshare_netns() is added to replace the existing local helpers create_netns().
Geliang Tang (9):
selftests/bpf: Add unshare_netns helper
selftests/bpf: Use unshare_netns helper
selftests/bpf: Drop duplicate create_netns
selftests/bpf: Export create_netns helper
selftests/bpf: Use create_netns helper
selftests/bpf: Export cleanup_netns helper
selftests/bpf: Use cleanup_netns helper
selftests/bpf: Use netns helpers in lwt tests
selftests/bpf: Use netns helpers in test_tunnel
tools/testing/selftests/bpf/network_helpers.c | 67 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 3 + .../selftests/bpf/prog_tests/assign_reuse.c | 12 +--- .../selftests/bpf/prog_tests/bind_perm.c | 11 +-- .../bpf/prog_tests/bpf_iter_setsockopt.c | 13 +--- .../bpf/prog_tests/btf_skc_cls_ingress.c | 6 +- .../selftests/bpf/prog_tests/crypto_sanity.c | 3 +- .../selftests/bpf/prog_tests/decap_sanity.c | 6 +- .../selftests/bpf/prog_tests/fib_lookup.c | 8 +-- .../selftests/bpf/prog_tests/lwt_helpers.h | 26 ++----- .../selftests/bpf/prog_tests/lwt_redirect.c | 2 - .../selftests/bpf/prog_tests/lwt_reroute.c | 2 - .../testing/selftests/bpf/prog_tests/mptcp.c | 22 +----- .../bpf/prog_tests/ns_current_pid_tgid.c | 9 +-- .../selftests/bpf/prog_tests/setget_sockopt.c | 10 +-- .../selftests/bpf/prog_tests/sk_assign.c | 4 +- .../selftests/bpf/prog_tests/sock_destroy.c | 9 +-- .../selftests/bpf/prog_tests/sock_fields.c | 13 +--- .../bpf/prog_tests/sock_iter_batch.c | 7 +- .../bpf/prog_tests/tcp_custom_syncookie.c | 5 +- .../bpf/prog_tests/tcp_hdr_options.c | 13 +--- .../selftests/bpf/prog_tests/test_tunnel.c | 19 +++--- .../bpf/prog_tests/xdp_dev_bound_only.c | 3 +- .../bpf/prog_tests/xdp_do_redirect.c | 4 +- 24 files changed, 114 insertions(+), 163 deletions(-)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 1/9 selftests/bpf: Add unshare_netns helper
From: Geliang Tang <[email protected]>
Many BPF selftests create new test network namespaces by using CLONE_NEWNET flag to unshare the network namespace, so that the calling process is moved into a new network namespace which is not shared with any previously existing process. So this patch adds a new helper in network_helpers.c named unshare_netns(), which create a new network namespace and set the net device lo up.
--- tools/testing/selftests/bpf/network_helpers.c | 19 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + 2 files changed, 20 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +19 -0
@@ -670,3 +670,22 @@ int send_recv_data(int lfd, int fd, uint32_t total_bytes)return err; } + +int unshare_netns (void ) +{ +int err; + + err =unshare (CLONE_NEWNET ); +if (err) { +log_err ("unshare netns failed" ); +return err; + } + + err =SYS_NOFAIL ("ip link set dev lo up" ); +if (err) { +log_err ("set dev lo up failed" ); +return err; + } + +return 0 ; +}
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -82,6 +82,7 @@ struct nstoken;struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token);int send_recv_data (int lfd,int fd,uint32_t total_bytes); +int unshare_netns (void );static __u16 csum_fold (__u32 csum) {
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 2/9 selftests/bpf: Use unshare_netns helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
The newly added helper unshare_netns() can be used to replace unshare() and "ip link set dev lo up" in sk_assign.c, btf_skc_cls_ingress.c and tcp_custom_syncookie.c to simplify the code.
--- .../testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 6 +----- tools/testing/selftests/bpf/prog_tests/sk_assign.c | 4 +--- .../testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +1 -5
@@ -27,15 +27,11 @@ static int prepare_netns(void)LIBBPF_OPTS (bpf_tc_opts, tc_attach, .prog_fd = bpf_program__fd(skel->progs.cls_ingress)); -if (CHECK (unshare (CLONE_NEWNET ),"create netns" , +if (CHECK (unshare_netns (),"create netns" ,"unshare(CLONE_NEWNET): %s (%d)" ,strerror (errno), errno))return -1 ; -if (CHECK (system ("ip link set dev lo up" ), -"ip link set dev lo up" ,"failed\n" )) -return -1 ; - qdisc_lo.ifindex =if_nametoindex ("lo" );if (!ASSERT_OK (bpf_tc_hook_create (&qdisc_lo),"qdisc add dev lo clsact" ))return -1 ;
tools/testing/selftests/bpf/prog_tests/sk_assign.c +1 -3
@@ -47,12 +47,10 @@ configure_stack(void)return false;/* Move to a new networking namespace */ -if (CHECK_FAIL (unshare (CLONE_NEWNET ))) +if (CHECK_FAIL (unshare_netns ()))return false;/* Configure necessary links, routes */ -if (CHECK_FAIL (system ("ip link set dev lo up" ))) -return false;if (CHECK_FAIL (system ("ip route add local default dev lo" )))return false;if (CHECK_FAIL (system ("ip -6 route add local default dev lo" )))
tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c +1 -4
@@ -32,12 +32,9 @@ static struct test_tcp_custom_syncookie_case {static int setup_netns (void ) { -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) +if (!ASSERT_OK (unshare_netns (),"create netns" ))return -1 ; -if (!ASSERT_OK (system ("ip link set dev lo up" ),"ip" )) - goto err; -if (!ASSERT_OK (write_sysctl ("/proc/sys/net/ipv4/tcp_ecn" ,"1" ),"write_sysctl" )) goto err;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 3/9 selftests/bpf: Drop duplicate create_netns
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch drops the duplicate local functions create_netns() in bind_perm.c, bpf_iter_setsockopt.c, setget_sockopt.c, sock_fields.c and tcp_hdr_options.c and uses unshare_netns() instead.
A new helper create_netns() will be added in network_helpers.c as a public one.
--- tools/testing/selftests/bpf/prog_tests/bind_perm.c | 11 ++--------- .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 13 +------------ .../selftests/bpf/prog_tests/setget_sockopt.c | 10 ++-------- .../testing/selftests/bpf/prog_tests/sock_fields.c | 13 +------------ .../selftests/bpf/prog_tests/tcp_hdr_options.c | 13 +------------ 5 files changed, 7 insertions(+), 53 deletions(-)
tools/testing/selftests/bpf/prog_tests/bind_perm.c +2 -9
@@ -7,16 +7,9 @@#include "test_progs.h" #include "cap_helpers.h" +#include "network_helpers.h" #include "bind_perm.skel.h" -static int create_netns (void ) -{ -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) -return -1 ; - -return 0 ; -} -void try_bind (int family,int port,int expected_errno) {struct sockaddr_storage addr = {};
@@ -54,7 +47,7 @@ void test_bind_perm(void)__u64 old_caps =0 ;int cgroup_fd; -if (create_netns ()) +if (unshare_netns ())return ; cgroup_fd =test__join_cgroup ("/bind_perm" );
tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt.c +1 -12
@@ -8,17 +8,6 @@#include "bpf_cubic.skel.h" #include "bpf_iter_setsockopt.skel.h" -static int create_netns (void ) -{ -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) -return -1 ; - -if (!ASSERT_OK (system ("ip link set dev lo up" ),"bring up lo" )) -return -1 ; - -return 0 ; -} -static unsigned int set_bpf_cubic (int *fds,unsigned int nr_fds) {unsigned int i;
@@ -187,7 +176,7 @@ void serial_test_bpf_iter_setsockopt(void)struct bpf_link *cubic_link =NULL ;struct bpf_link *dctcp_link =NULL ; -if (create_netns ()) +if (unshare_netns ())return ;/* Load iter_skel */
tools/testing/selftests/bpf/prog_tests/setget_sockopt.c +2 -8
@@ -20,14 +20,8 @@ static const char addr6_str[] = "::1";static struct setget_sockopt *skel;static int cg_fd; -static int create_netns (void ) +static int create_veth (void ) { -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) -return -1 ; - -if (!ASSERT_OK (system ("ip link set dev lo up" ),"set lo up" )) -return -1 ; -if (!ASSERT_OK (system ("ip link add dev binddevtest1 type veth peer name binddevtest2" ),"add veth" ))return -1 ;
@@ -160,7 +154,7 @@ void test_setget_sockopt(void)if (cg_fd <0 )return ; -if (create_netns ()) +if (unshare_netns () ||create_veth ()) goto done; skel =setget_sockopt__open ();
tools/testing/selftests/bpf/prog_tests/sock_fields.c +1 -12
@@ -45,17 +45,6 @@ static __u64 child_cg_id;static int linum_map_fd;static __u32 duration; -static bool create_netns (void ) -{ -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) -return false; - -if (!ASSERT_OK (system ("ip link set dev lo up" ),"bring up lo" )) -return false; - -return true; -} -static void print_sk (const struct bpf_sock *sk,const char *prefix) {char src_ip4[24 ], dst_ip4[24 ];
@@ -350,7 +339,7 @@ void serial_test_sock_fields(void)struct bpf_link *link;/* Use a dedicated netns to have a fixed listen port */ -if (!create_netns ()) +if (unshare_netns ())return ;/* Create a cgroup, get fd, and join it */
tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c +1 -12
@@ -40,17 +40,6 @@ struct sk_fds {int active_lport; }; -static int create_netns (void ) -{ -if (!ASSERT_OK (unshare (CLONE_NEWNET ),"create netns" )) -return -1 ; - -if (!ASSERT_OK (system ("ip link set dev lo up" ),"run ip cmd" )) -return -1 ; - -return 0 ; -} -static void print_hdr_stg (const struct hdr_stg *hdr_stg,const char *prefix) { fprintf(stderr, "%s{active:%u, resend_syn:%u, syncookie:%u, fastopen:%u}\n",
@@ -548,7 +537,7 @@ void test_tcp_hdr_options(void)if (!test__start_subtest (tests[i].desc))continue ; -if (create_netns ()) +if (unshare_netns ())break ; tests[i].run ();
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 4/9 selftests/bpf: Export create_netns helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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.
--- 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(-)
tools/testing/selftests/bpf/network_helpers.c +27 -0
@@ -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;
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -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 );
tools/testing/selftests/bpf/prog_tests/mptcp.c +2 -12
@@ -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;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 5/9 selftests/bpf: Use create_netns helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
The newly added helper create_netns() can be used in assign_reuse.c, fib_lookup.c, ns_current_pid_tgid.c, sock_destroy.c and sock_iter_batch.c to simplify the code.
It changes the behavior of test fib_lookup.c a little bit, but doesn't affect the results.
--- tools/testing/selftests/bpf/prog_tests/assign_reuse.c | 9 ++------- tools/testing/selftests/bpf/prog_tests/fib_lookup.c | 4 +--- .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 5 +---- tools/testing/selftests/bpf/prog_tests/sock_destroy.c | 5 +---- tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c | 4 +--- 5 files changed, 6 insertions(+), 21 deletions(-)
tools/testing/selftests/bpf/prog_tests/assign_reuse.c +2 -7
@@ -175,12 +175,9 @@ void test_assign_reuse(void) {struct nstoken *tok =NULL ; -SYS (out,"ip netns add %s" ,NS_TEST ); -SYS (cleanup,"ip -net %s link set dev lo up" ,NS_TEST ); - - tok =open_netns (NS_TEST ); + tok =create_netns (NS_TEST );if (!ASSERT_OK_PTR (tok,"netns token" )) -return ; + goto cleanup;if (test__start_subtest ("tcpv4" ))run_assign_reuse (AF_INET ,SOCK_STREAM ,"127.0.0.1" ,PORT );
@@ -194,6 +191,4 @@ void test_assign_reuse(void) cleanup:close_netns (tok);SYS_NOFAIL ("ip netns delete %s" ,NS_TEST ); -out: -return ; }
tools/testing/selftests/bpf/prog_tests/fib_lookup.c +1 -3
@@ -315,9 +315,7 @@ void test_fib_lookup(void)return ; prog_fd =bpf_program__fd (skel->progs.fib_lookup); -SYS (fail,"ip netns add %s" ,NS_TEST ); - - nstoken =open_netns (NS_TEST ); + nstoken =create_netns (NS_TEST );if (!ASSERT_OK_PTR (nstoken,"open_netns" )) goto fail;
tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +1 -4
@@ -204,10 +204,7 @@ static void test_in_netns(int (*fn)(void *), void *arg) {struct nstoken *nstoken =NULL ; -SYS (cleanup,"ip netns add ns_current_pid_tgid" ); -SYS (cleanup,"ip -net ns_current_pid_tgid link set dev lo up" ); - - nstoken =open_netns ("ns_current_pid_tgid" ); + nstoken =create_netns ("ns_current_pid_tgid" );if (!ASSERT_OK_PTR (nstoken,"open_netns" )) goto cleanup;
tools/testing/selftests/bpf/prog_tests/sock_destroy.c +1 -4
@@ -193,10 +193,7 @@ void test_sock_destroy(void)if (!ASSERT_OK_PTR (skel->links.sock_connect,"prog_attach" )) goto cleanup; -SYS (cleanup,"ip netns add %s" ,TEST_NS ); -SYS (cleanup,"ip -net %s link set dev lo up" ,TEST_NS ); - - nstoken =open_netns (TEST_NS ); + nstoken =create_netns (TEST_NS );if (!ASSERT_OK_PTR (nstoken,"open_netns" )) goto cleanup;
tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c +1 -3
@@ -113,10 +113,8 @@ void test_sock_iter_batch(void)struct nstoken *nstoken =NULL ;SYS_NOFAIL ("ip netns del " TEST_NS ); -SYS (done,"ip netns add %s" ,TEST_NS ); -SYS (done,"ip -net %s link set dev lo up" ,TEST_NS ); - nstoken =open_netns (TEST_NS ); + nstoken =create_netns (TEST_NS );if (!ASSERT_OK_PTR (nstoken,"open_netns" )) goto done;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 6/9 selftests/bpf: Export cleanup_netns helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a new struct member name in struct nstoken, to save the name of the given network namespace. It dups the name string in open_netns() and freed in close_netns().
Then move cleanup_netns() from mptcp.c into network_helpers.c as a public helper. In it the newly added name field is passed to command "ip netns del" to delete this network namespace. This makes it more flexible.
--- tools/testing/selftests/bpf/network_helpers.c | 21 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../testing/selftests/bpf/prog_tests/mptcp.c | 8 ------- 3 files changed, 22 insertions(+), 8 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +21 -0
@@ -444,6 +444,7 @@ char *ping_command(int family)struct nstoken {int orig_netns_fd; +char *name; };struct nstoken *open_netns (const char *name)
@@ -459,6 +460,13 @@ struct nstoken *open_netns(const char *name)return NULL ; } + token->name =strdup (name); +if (!token->name) { +log_err ("Failed to dup name" ); +free (token); +return NULL ; + } + token->orig_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY );if (token->orig_netns_fd ==-1 ) {log_err ("Failed to open(/proc/self/ns/net)" );
@@ -483,6 +491,7 @@ struct nstoken *open_netns(const char *name) fail:if (token->orig_netns_fd !=-1 )close (token->orig_netns_fd); +free (token->name);free (token);return NULL ; }
@@ -494,10 +503,22 @@ void close_netns(struct nstoken *token)if (setns (token->orig_netns_fd,CLONE_NEWNET ))log_err ("Failed to setns(orig_netns_fd)" ); +if (token->name) +free (token->name);close (token->orig_netns_fd);free (token); } +void cleanup_netns (struct nstoken *token) +{ +if (!token) +return ; + +if (SYS_NOFAIL ("ip netns del %s" , token->name)) +log_err ("del netns %s failed" , token->name); +close_netns (token); +} +struct nstoken *create_netns (const char *name) {struct nstoken *token =NULL ;
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -81,6 +81,7 @@ struct nstoken;*/ struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token); +void cleanup_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 );
tools/testing/selftests/bpf/prog_tests/mptcp.c +0 -8
@@ -79,14 +79,6 @@ struct mptcp_storage {char ca_name[TCP_CA_NAME_MAX ]; }; -static void cleanup_netns (struct nstoken *nstoken) -{ -if (nstoken) -close_netns (nstoken); - -SYS_NOFAIL ("ip netns del %s" ,NS_TEST ); -} -static int start_mptcp_server (int family,const char *addr_str,__u16 port,int timeout_ms) {
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 7/9 selftests/bpf: Use cleanup_netns helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses cleanup_netns() helper in BPF tests wide to replace close_netns() and "ip netns del", included assign_reuse.c, crypto_sanity.c, decap_sanity.c, fib_lookup.c, ns_current_pid_tgid.c, sock_destroy.c, sock_iter_batch.c, xdp_dev_bound_only.c and xdp_do_redirect.c. This can simplify the code.
--- tools/testing/selftests/bpf/prog_tests/assign_reuse.c | 3 +-- tools/testing/selftests/bpf/prog_tests/crypto_sanity.c | 3 +-- tools/testing/selftests/bpf/prog_tests/decap_sanity.c | 6 ++---- tools/testing/selftests/bpf/prog_tests/fib_lookup.c | 4 +--- .../testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c | 4 +--- tools/testing/selftests/bpf/prog_tests/sock_destroy.c | 4 +--- tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c | 3 +-- tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c | 3 +-- tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c | 4 +--- 9 files changed, 10 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/prog_tests/assign_reuse.c +1 -2
@@ -189,6 +189,5 @@ void test_assign_reuse(void)run_assign_reuse (AF_INET6 ,SOCK_DGRAM ,"::1" ,PORT ); cleanup: -close_netns (tok); -SYS_NOFAIL ("ip netns delete %s" ,NS_TEST ); +cleanup_netns (tok); }
tools/testing/selftests/bpf/prog_tests/crypto_sanity.c +1 -2
@@ -190,8 +190,7 @@ void test_crypto_sanity(void)ASSERT_OK (err,"bpf_tc_detach decrypt" ); fail: -close_netns (nstoken); +cleanup_netns (nstoken);deinit_afalg (); -SYS_NOFAIL ("ip netns del " NS_TEST " &> /dev/null" );crypto_sanity__destroy (skel); }
tools/testing/selftests/bpf/prog_tests/decap_sanity.c +2 -4
@@ -68,10 +68,8 @@ void test_decap_sanity(void)ASSERT_FALSE (skel->bss->broken_csum_start,"broken_csum_start" ); fail: -if (nstoken) { +if (nstoken)bpf_tc_hook_destroy (&qdisc_hook); -close_netns (nstoken); - } -SYS_NOFAIL ("ip netns del " NS_TEST ); +cleanup_netns (nstoken);decap_sanity__destroy (skel); }
tools/testing/selftests/bpf/prog_tests/fib_lookup.c +1 -3
@@ -368,8 +368,6 @@ void test_fib_lookup(void) } fail: -if (nstoken) -close_netns (nstoken); -SYS_NOFAIL ("ip netns del " NS_TEST ); +cleanup_netns (nstoken);fib_lookup__destroy (skel); }
tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +1 -3
@@ -211,9 +211,7 @@ static void test_in_netns(int (*fn)(void *), void *arg)test_ns_current_pid_tgid_new_ns (fn, arg); cleanup: -if (nstoken) -close_netns (nstoken); -SYS_NOFAIL ("ip netns del ns_current_pid_tgid" ); +cleanup_netns (nstoken); }/* TODO: use a different tracepoint */
tools/testing/selftests/bpf/prog_tests/sock_destroy.c +1 -3
@@ -209,9 +209,7 @@ void test_sock_destroy(void)RUN_TESTS (sock_destroy_prog_fail); cleanup: -if (nstoken) -close_netns (nstoken); -SYS_NOFAIL ("ip netns del " TEST_NS ); +cleanup_netns (nstoken);if (cgroup_fd >=0 )close (cgroup_fd);sock_destroy_prog__destroy (skel);
tools/testing/selftests/bpf/prog_tests/sock_iter_batch.c +1 -2
@@ -126,8 +126,7 @@ void test_sock_iter_batch(void)do_test (SOCK_DGRAM , true);do_test (SOCK_DGRAM , false); } -close_netns (nstoken); done: -SYS_NOFAIL ("ip netns del " TEST_NS ); +cleanup_netns (nstoken); }
tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c +1 -2
@@ -53,9 +53,8 @@ void test_xdp_dev_bound_only_offdev(void) out:close (fd1);close (fd2); -close_netns (tok);/* eth42 was added inside netns, removing the netns will * also remove eth42 veth pair. */ -SYS_NOFAIL ("ip netns del " LOCAL_NETNS ); +cleanup_netns (tok); }
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +1 -3
@@ -241,8 +241,6 @@ void test_xdp_do_redirect(void) out_tc:bpf_tc_hook_destroy (&tc_hook); out: -if (nstoken) -close_netns (nstoken); -SYS_NOFAIL ("ip netns del testns" ); +cleanup_netns (nstoken);test_xdp_do_redirect__destroy (skel); }
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 8/9 selftests/bpf: Use netns helpers in lwt tests
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses netns helpers create_netns() and cleanup_netns() in lwt_helpers.h instead of using the local function netns_create() and netns_delete().
For using these helpers. network_helpers.h needs to be included in lwt_helpers.h. Then '#include "network_helpers.h"' in lwt_redirect.c and lwt_reroute.c can be dropped.
--- .../selftests/bpf/prog_tests/lwt_helpers.h | 26 +++++-------------- .../selftests/bpf/prog_tests/lwt_redirect.c | 2 -- .../selftests/bpf/prog_tests/lwt_reroute.c | 2 -- 3 files changed, 7 insertions(+), 23 deletions(-)
tools/testing/selftests/bpf/prog_tests/lwt_helpers.h +7 -19
@@ -9,6 +9,7 @@#include <linux/icmp.h> #include "test_progs.h" +#include "network_helpers.h" #define log_err (MSG , ...) \ fprintf(stderr, "(%s:%d: errno: %s) " MSG "\n", \
@@ -16,27 +17,14 @@#define RUN_TEST (name) \ ({ \ - if (test__start_subtest(#name)) \ - if (ASSERT_OK(netns_create(), "netns_create")) { \ - struct nstoken *token = open_netns(NETNS); \ - if (ASSERT_OK_PTR(token, "setns")) { \ - test_ ## name(); \ - close_netns(token); \ - } \ - netns_delete(); \ - } \ + if (test__start_subtest(#name)) { \ + struct nstoken *token = create_netns(NETNS); \ + if (ASSERT_OK_PTR(token, "setns")) \ + test_ ## name(); \ + cleanup_netns(token); \ + } \ }) -static inline int netns_create (void ) -{ -return system ("ip netns add " NETNS ); -} - -static inline int netns_delete (void ) -{ -return system ("ip netns del " NETNS ">/dev/null 2>&1" ); -} -static int open_tuntap (const char *dev_name,bool need_mac) {int err =0 ;
tools/testing/selftests/bpf/prog_tests/lwt_redirect.c +0 -2
@@ -57,7 +57,6 @@#define NETNS "ns_lwt_redirect"#include "lwt_helpers.h" #include "test_progs.h" -#include "network_helpers.h" #define BPF_OBJECT "test_lwt_redirect.bpf.o"#define INGRESS_SEC (need_mac) ((need_mac) ? "redir_ingress" : "redir_ingress_nomac")
@@ -308,7 +307,6 @@ static void test_lwt_redirect_dev_carrier_down(void)static void *test_lwt_redirect_run (void *arg) { -netns_delete ();RUN_TEST (lwt_redirect_normal);RUN_TEST (lwt_redirect_normal_nomac);RUN_TEST (lwt_redirect_dev_down);
tools/testing/selftests/bpf/prog_tests/lwt_reroute.c +0 -2
@@ -50,7 +50,6 @@*/ #define NETNS "ns_lwt_reroute"#include "lwt_helpers.h" -#include "network_helpers.h" #include <linux/net_tstamp.h> #define BPF_OBJECT "test_lwt_reroute.bpf.o"
@@ -242,7 +241,6 @@ static void test_lwt_reroute_qdisc_dropped(void)static void *test_lwt_reroute_run (void *arg) { -netns_delete ();RUN_TEST (lwt_reroute_normal_xmit);RUN_TEST (lwt_reroute_qdisc_dropped);return NULL ;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH 9/9 selftests/bpf: Use netns helpers in test_tunnel
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses netns helpers create_netns() and cleanup_netns() in test_tunnel.c instead of using open_netns() and close_netns() directly.
--- .../selftests/bpf/prog_tests/test_tunnel.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/test_tunnel.c +9 -10
@@ -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;
Signature · 1 line
2.43.0
Geliang Tang
reviewerRe: [PATCH bpf-next 9/9] selftests/bpf: Use netns helpers in test_tunnel
Sorry, this patch breaks CI.
Changes Requested.
-Geliang
Quoted 105 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch uses netns helpers
create_netns()andcleanup_netns()intest_tunnel.cinstead of usingopen_netns()andclose_netns()directly.Signed-off-by Geliang Tang <[email protected]>---
.../selftests/bpf/prog_tests/test_tunnel.c | 19 +++++++++-------- --1 file changed, 9 insertions(+), 10 deletions(-)tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -102,7 +102,6 @@
static intconfig_device(void)
{tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-1-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");tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -117,7 +116,7 @@ static int config_device(void)
static void cleanup(void)
{tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-1- SYS_NOFAIL("test -f /var/run/netns/at_ns0 && ip netns delete
at_ns0");tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-0+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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -444,7 +443,7 @@ static void test_vxlan_tunnel(void) goto done;
/* load and attach progset_mdto tunnel dev tc hook pointat_ns0*/tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1- 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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1@@ -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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -517,7 +516,7 @@ static void test_ip6vxlan_tunnel(void) goto done;
/* load and attach progset_mdto tunnel dev tc hook pointat_ns0*/tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1- 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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1@@ -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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -611,13 +610,13 @@ static void test_ipip_tunnel(enum ipip_encap encap) goto done;
/* ping fromat_ns0namespace test */tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1- 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;tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1-close_netns (nstoken); +cleanup_netns (nstoken);
done:
/* delete ipip tunnel */tools/testing/selftests/bpf/prog_tests/test_tunnel.c +0
-0@@ -667,11 +666,11 @@ static void test_xfrm_tunnel(void) goto done;
/* ping fromat_ns0namespace test */tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1- 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);tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1
-1-close_netns (nstoken); +cleanup_netns (nstoken);if (!ASSERT_OK(err, "
test_ping"))
goto done;