selftests/bpf: Remove unnecessary mount/umount dance
Subsystems (6)
Martin KaFai Lau
reviewercover selftests/bpf: Remove unnecessary mount/umount dance
From: Martin KaFai Lau <[email protected]>
Some of the tests do mount/umount dance when switching netns.
It is error-prone like https://lore.kernel.org/bpf/[email protected]/
Another issue is, there are many left over after running some of the tests:
#> mount | egrep sysfs | wc -l
19
Instead of further debugging this dance, this set is to avoid the needs to do this remounting altogether. It will then allow those tests to be run in parallel again.
Martin KaFai Lau (7):
selftests/bpf: Use if_nametoindex instead of reading the
/sys/net/class/*/ifindex
selftests/bpf: Avoid pinning bpf prog in the tc_redirect_dtime test selftests/bpf: Avoid pinning bpf prog in the tc_redirect_peer_l3 test selftests/bpf: Avoid pinning bpf prog in the netns_load_bpf() callers selftests/bpf: Remove the "/sys" mount and umount dance in
{open,close}_netns
selftests/bpf: Remove serial from tests using {open,close}_netns selftests/bpf: Avoid pinning prog when attaching to tc ingress in
btf_skc_cls_ingress
tools/testing/selftests/bpf/network_helpers.c | 51 +-- .../bpf/prog_tests/btf_skc_cls_ingress.c | 25 +- .../selftests/bpf/prog_tests/empty_skb.c | 2 +- .../selftests/bpf/prog_tests/tc_redirect.c | 314 +++++++++--------- .../selftests/bpf/prog_tests/test_tunnel.c | 2 +- .../bpf/prog_tests/xdp_do_redirect.c | 2 +- .../selftests/bpf/prog_tests/xdp_synproxy.c | 2 +- 7 files changed, 178 insertions(+), 220 deletions(-)
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 1/7 selftests/bpf: Use if_nametoindex instead of reading the /sys/net/class/*/ifindex
From: Martin KaFai Lau <[email protected]>
When switching netns, the setns_by_fd() is doing dances in mount/umounting the /sys directories. One reason is the tc_redirect.c test is depending on the /sys/net/class/*/ifindex instead of using the if_nametoindex(). if_nametoindex() uses ioctl() to get the ifindex.
This patch is to move all /sys/net/class/*/ifindex usages to if_nametoindex(). The current code checks ifindex >= 0 which is incorrect. ifindex > 0 should be checked instead. This patch also stores ifindex_veth_src and ifindex_veth_dst since the latter patch will need them.
--- .../selftests/bpf/prog_tests/tc_redirect.c | 46 ++++++++----------- 1 file changed, 18 insertions(+), 28 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +18 -28
@@ -11,12 +11,12 @@*/ #include <arpa/inet.h> -#include <linux/if.h> #include <linux/if_tun.h> #include <linux/limits.h> #include <linux/sysctl.h> #include <linux/time_types.h> #include <linux/net_tstamp.h> +#include <net/if.h> #include <stdbool.h> #include <stdio.h> #include <sys/stat.h>
@@ -115,7 +115,9 @@ static void netns_setup_namespaces_nofail(const char *verb) }struct netns_setup_result { +int ifindex_veth_src;int ifindex_veth_src_fwd; +int ifindex_veth_dst;int ifindex_veth_dst_fwd; };
@@ -139,27 +141,6 @@ static int get_ifaddr(const char *name, char *ifaddr)return 0 ; } -static int get_ifindex (const char *name) -{ -char path[PATH_MAX ]; -char buf[32 ]; -FILE *f; -int ret; - -snprintf (path,PATH_MAX ,"/sys/class/net/%s/ifindex" , name); - f =fopen (path,"r" ); -if (!ASSERT_OK_PTR (f, path)) -return -1 ; - - ret =fread (buf,1 ,sizeof (buf), f); -if (!ASSERT_GT (ret,0 ,"fread ifindex" )) { -fclose (f); -return -1 ; - } -fclose (f); -return atoi (buf); -} -#define SYS (fmt, ...) \ ({ \ char cmd[1024]; \
@@ -182,11 +163,20 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result)if (get_ifaddr ("veth_src_fwd" , veth_src_fwd_addr)) goto fail; - result->ifindex_veth_src_fwd =get_ifindex ("veth_src_fwd" ); -if (result->ifindex_veth_src_fwd <0 ) + result->ifindex_veth_src =if_nametoindex ("veth_src" ); +if (!ASSERT_GT (result->ifindex_veth_src,0 ,"ifindex_veth_src" )) goto fail; - result->ifindex_veth_dst_fwd =get_ifindex ("veth_dst_fwd" ); -if (result->ifindex_veth_dst_fwd <0 ) + + result->ifindex_veth_src_fwd =if_nametoindex ("veth_src_fwd" ); +if (!ASSERT_GT (result->ifindex_veth_src_fwd,0 ,"ifindex_veth_src_fwd" )) + goto fail; + + result->ifindex_veth_dst =if_nametoindex ("veth_dst" ); +if (!ASSERT_GT (result->ifindex_veth_dst,0 ,"ifindex_veth_dst" )) + goto fail; + + result->ifindex_veth_dst_fwd =if_nametoindex ("veth_dst_fwd" ); +if (!ASSERT_GT (result->ifindex_veth_dst_fwd,0 ,"ifindex_veth_dst_fwd" )) goto fail;SYS ("ip link set veth_src netns " NS_SRC );
@@ -1034,8 +1024,8 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result)if (!ASSERT_OK_PTR (skel,"test_tc_peer__open" )) goto fail; - ifindex =get_ifindex ("tun_fwd" ); -if (!ASSERT_GE (ifindex,0 ,"get_ifindex tun_fwd" )) + ifindex =if_nametoindex ("tun_fwd" ); +if (!ASSERT_GT (ifindex,0 ,"if_indextoname tun_fwd" )) goto fail; skel->rodata->IFINDEX_SRC = ifindex;
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 2/7 selftests/bpf: Avoid pinning bpf prog in the tc_redirect_dtime test
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
This patch removes the need to pin prog in the tc_redirect_dtime test by directly using the bpf_tc_hook_create() and bpf_tc_attach(). The clsact qdisc will go away together with the test netns, so no need to do bpf_tc_hook_destroy().
--- .../selftests/bpf/prog_tests/tc_redirect.c | 149 ++++++++++++------ 1 file changed, 100 insertions(+), 49 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +100 -49
@@ -250,6 +250,56 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result)return -1 ; } +static int qdisc_clsact_create (struct bpf_tc_hook *qdisc_hook,int ifindex) +{ +char err_str[128 ], ifname[16 ]; +int err; + + qdisc_hook->ifindex = ifindex; + qdisc_hook->attach_point =BPF_TC_INGRESS |BPF_TC_EGRESS ; + err =bpf_tc_hook_create (qdisc_hook); +snprintf (err_str,sizeof (err_str), +"qdisc add dev %s clsact" , +if_indextoname (qdisc_hook->ifindex, ifname) ? :"<unknown_iface>" ); + err_str[sizeof (err_str) -1 ] =0 ; +ASSERT_OK (err, err_str); + +return err; +} + +static int xgress_filter_add (struct bpf_tc_hook *qdisc_hook, +enum bpf_tc_attach_point xgress, +const struct bpf_program *prog,int priority) +{ +LIBBPF_OPTS (bpf_tc_opts, tc_attach); +char err_str[128 ], ifname[16 ]; +int err; + + qdisc_hook->attach_point = xgress; + tc_attach.prog_fd =bpf_program__fd (prog); + tc_attach.priority = priority; + err =bpf_tc_attach (qdisc_hook, &tc_attach); +snprintf (err_str,sizeof (err_str), +"filter add dev %s %s prio %d bpf da %s" , +if_indextoname (qdisc_hook->ifindex, ifname) ? :"<unknown_iface>" , + xgress ==BPF_TC_INGRESS ?"ingress" :"egress" , + priority,bpf_program__name (prog)); + err_str[sizeof (err_str) -1 ] =0 ; +ASSERT_OK (err, err_str); + +return err; +} + +#define QDISC_CLSACT_CREATE (qdisc_hook, ifindex) ({ \ + if ((err = qdisc_clsact_create(qdisc_hook, ifindex))) \ + goto fail; \ +}) + +#define XGRESS_FILTER_ADD (qdisc_hook, xgress, prog, priority) ({ \ + if ((err = xgress_filter_add(qdisc_hook, xgress, prog, priority))) \ + goto fail; \ +}) +static int netns_load_bpf (void ) {SYS ("tc qdisc add dev veth_src_fwd clsact" );
@@ -489,78 +539,79 @@ static void test_inet_dtime(int family, int type, const char *addr, __u16 port)close (client_fd); } -static int netns_load_dtime_bpf (struct test_tc_dtime *skel) +static int netns_load_dtime_bpf (struct test_tc_dtime *skel, +const struct netns_setup_result *setup_result) { +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_src_fwd); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_dst_fwd); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_src); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_dst);struct nstoken *nstoken; - -#define PIN_FNAME (__file) "/sys/fs/bpf/" #__file -#define PIN (__prog) ({ \ - int err = bpf_program__pin(skel->progs.__prog, PIN_FNAME(__prog)); \ - if (!ASSERT_OK(err, "pin " #__prog)) \ - goto fail; \ - }) +int err;/* setup ns_src tc progs */ nstoken =open_netns (NS_SRC );if (!ASSERT_OK_PTR (nstoken,"setns " NS_SRC ))return -1 ; -PIN (egress_host); -PIN (ingress_host); -SYS ("tc qdisc add dev veth_src clsact" ); -SYS ("tc filter add dev veth_src ingress bpf da object-pinned " -PIN_FNAME (ingress_host)); -SYS ("tc filter add dev veth_src egress bpf da object-pinned " -PIN_FNAME (egress_host)); +/* tc qdisc add dev veth_src clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_src, setup_result->ifindex_veth_src); +/* tc filter add dev veth_src ingress bpf da ingress_host */ +XGRESS_FILTER_ADD (&qdisc_veth_src,BPF_TC_INGRESS , skel->progs.ingress_host,0 ); +/* tc filter add dev veth_src egress bpf da egress_host */ +XGRESS_FILTER_ADD (&qdisc_veth_src,BPF_TC_EGRESS , skel->progs.egress_host,0 );close_netns (nstoken);/* setup ns_dst tc progs */ nstoken =open_netns (NS_DST );if (!ASSERT_OK_PTR (nstoken,"setns " NS_DST ))return -1 ; -PIN (egress_host); -PIN (ingress_host); -SYS ("tc qdisc add dev veth_dst clsact" ); -SYS ("tc filter add dev veth_dst ingress bpf da object-pinned " -PIN_FNAME (ingress_host)); -SYS ("tc filter add dev veth_dst egress bpf da object-pinned " -PIN_FNAME (egress_host)); +/* tc qdisc add dev veth_dst clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_dst, setup_result->ifindex_veth_dst); +/* tc filter add dev veth_dst ingress bpf da ingress_host */ +XGRESS_FILTER_ADD (&qdisc_veth_dst,BPF_TC_INGRESS , skel->progs.ingress_host,0 ); +/* tc filter add dev veth_dst egress bpf da egress_host */ +XGRESS_FILTER_ADD (&qdisc_veth_dst,BPF_TC_EGRESS , skel->progs.egress_host,0 );close_netns (nstoken);/* setup ns_fwd tc progs */ nstoken =open_netns (NS_FWD );if (!ASSERT_OK_PTR (nstoken,"setns " NS_FWD ))return -1 ; -PIN (ingress_fwdns_prio100); -PIN (egress_fwdns_prio100); -PIN (ingress_fwdns_prio101); -PIN (egress_fwdns_prio101); -SYS ("tc qdisc add dev veth_dst_fwd clsact" ); -SYS ("tc filter add dev veth_dst_fwd ingress prio 100 bpf da object-pinned " -PIN_FNAME (ingress_fwdns_prio100)); -SYS ("tc filter add dev veth_dst_fwd ingress prio 101 bpf da object-pinned " -PIN_FNAME (ingress_fwdns_prio101)); -SYS ("tc filter add dev veth_dst_fwd egress prio 100 bpf da object-pinned " -PIN_FNAME (egress_fwdns_prio100)); -SYS ("tc filter add dev veth_dst_fwd egress prio 101 bpf da object-pinned " -PIN_FNAME (egress_fwdns_prio101)); -SYS ("tc qdisc add dev veth_src_fwd clsact" ); -SYS ("tc filter add dev veth_src_fwd ingress prio 100 bpf da object-pinned " -PIN_FNAME (ingress_fwdns_prio100)); -SYS ("tc filter add dev veth_src_fwd ingress prio 101 bpf da object-pinned " -PIN_FNAME (ingress_fwdns_prio101)); -SYS ("tc filter add dev veth_src_fwd egress prio 100 bpf da object-pinned " -PIN_FNAME (egress_fwdns_prio100)); -SYS ("tc filter add dev veth_src_fwd egress prio 101 bpf da object-pinned " -PIN_FNAME (egress_fwdns_prio101)); +/* tc qdisc add dev veth_dst_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_dst_fwd, setup_result->ifindex_veth_dst_fwd); +/* tc filter add dev veth_dst_fwd ingress prio 100 bpf da ingress_fwdns_prio100 */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_INGRESS , + skel->progs.ingress_fwdns_prio100,100 ); +/* tc filter add dev veth_dst_fwd ingress prio 101 bpf da ingress_fwdns_prio101 */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_INGRESS , + skel->progs.ingress_fwdns_prio101,101 ); +/* tc filter add dev veth_dst_fwd egress prio 100 bpf da egress_fwdns_prio100 */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_EGRESS , + skel->progs.egress_fwdns_prio100,100 ); +/* tc filter add dev veth_dst_fwd egress prio 101 bpf da egress_fwdns_prio101 */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_EGRESS , + skel->progs.egress_fwdns_prio101,101 ); + +/* tc qdisc add dev veth_src_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_src_fwd, setup_result->ifindex_veth_src_fwd); +/* tc filter add dev veth_src_fwd ingress prio 100 bpf da ingress_fwdns_prio100 */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_INGRESS , + skel->progs.ingress_fwdns_prio100,100 ); +/* tc filter add dev veth_src_fwd ingress prio 101 bpf da ingress_fwdns_prio101 */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_INGRESS , + skel->progs.ingress_fwdns_prio101,101 ); +/* tc filter add dev veth_src_fwd egress prio 100 bpf da egress_fwdns_prio100 */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_EGRESS , + skel->progs.egress_fwdns_prio100,100 ); +/* tc filter add dev veth_src_fwd egress prio 101 bpf da egress_fwdns_prio101 */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_EGRESS , + skel->progs.egress_fwdns_prio101,101 );close_netns (nstoken); - -#undef PIN -return 0 ; fail:close_netns (nstoken); -return -1 ; +return err; }enum {
@@ -736,7 +787,7 @@ static void test_tc_redirect_dtime(struct netns_setup_result *setup_result)if (!ASSERT_OK (err,"test_tc_dtime__load" )) goto done; -if (netns_load_dtime_bpf (skel)) +if (netns_load_dtime_bpf (skel, setup_result)) goto done; nstoken =open_netns (NS_FWD );
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 3/7 selftests/bpf: Avoid pinning bpf prog in the tc_redirect_peer_l3 test
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
This patch removes the need to pin prog in the tc_redirect_peer_l3 test by directly using the bpf_tc_hook_create() and bpf_tc_attach(). The clsact qdisc will go away together with the test netns, so no need to do bpf_tc_hook_destroy().
--- .../selftests/bpf/prog_tests/tc_redirect.c | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +12 -20
@@ -1032,6 +1032,8 @@ static int tun_relay_loop(int src_fd, int target_fd)static void test_tc_redirect_peer_l3 (struct netns_setup_result *setup_result) { +LIBBPF_OPTS (bpf_tc_hook, qdisc_tun_fwd); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_dst_fwd);struct test_tc_peer *skel =NULL ;struct nstoken *nstoken =NULL ;int err;
@@ -1086,31 +1088,21 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result)if (!ASSERT_OK (err,"test_tc_peer__load" )) goto fail; - err =bpf_program__pin (skel->progs.tc_src_l3,SRC_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " SRC_PROG_PIN_FILE )) - goto fail; - - err =bpf_program__pin (skel->progs.tc_dst_l3,DST_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " DST_PROG_PIN_FILE )) - goto fail; - - err =bpf_program__pin (skel->progs.tc_chk,CHK_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " CHK_PROG_PIN_FILE )) - goto fail; -/* Load "tc_src_l3" to the tun_fwd interface to redirect packets * towards dst, and "tc_dst" to redirect packets * and "tc_chk" on veth_dst_fwd to drop non-redirected packets. */ -SYS ("tc qdisc add dev tun_fwd clsact" ); -SYS ("tc filter add dev tun_fwd ingress bpf da object-pinned " -SRC_PROG_PIN_FILE ); +/* tc qdisc add dev tun_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_tun_fwd, ifindex); +/* tc filter add dev tun_fwd ingress bpf da tc_src_l3 */ +XGRESS_FILTER_ADD (&qdisc_tun_fwd,BPF_TC_INGRESS , skel->progs.tc_src_l3,0 ); -SYS ("tc qdisc add dev veth_dst_fwd clsact" ); -SYS ("tc filter add dev veth_dst_fwd ingress bpf da object-pinned " -DST_PROG_PIN_FILE ); -SYS ("tc filter add dev veth_dst_fwd egress bpf da object-pinned " -CHK_PROG_PIN_FILE ); +/* tc qdisc add dev veth_dst_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_dst_fwd, setup_result->ifindex_veth_dst_fwd); +/* tc filter add dev veth_dst_fwd ingress bpf da tc_dst_l3 */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_INGRESS , skel->progs.tc_dst_l3,0 ); +/* tc filter add dev veth_dst_fwd egress bpf da tc_chk */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_EGRESS , skel->progs.tc_chk,0 );/* Setup route and neigh tables */ SYS ("ip -netns " NS_SRC " addr add dev tun_src " IP4_TUN_SRC "/24" );
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 4/7 selftests/bpf: Avoid pinning bpf prog in the netns_load_bpf() callers
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
This patch removes the need to pin prog in the remaining tests in tc_redirect.c by directly using the bpf_tc_hook_create() and bpf_tc_attach(). The clsact qdisc will go away together with the test netns, so no need to do bpf_tc_hook_destroy().
--- .../selftests/bpf/prog_tests/tc_redirect.c | 83 ++++++------------- 1 file changed, 27 insertions(+), 56 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +27 -56
@@ -59,10 +59,6 @@#define IFADDR_STR_LEN 18#define PING_ARGS "-i 0.2 -c 3 -w 10 -q" -#define SRC_PROG_PIN_FILE "/sys/fs/bpf/test_tc_src" -#define DST_PROG_PIN_FILE "/sys/fs/bpf/test_tc_dst" -#define CHK_PROG_PIN_FILE "/sys/fs/bpf/test_tc_chk" -#define TIMEOUT_MILLIS 10000#define NSEC_PER_SEC 1000000000ULL
@@ -300,19 +296,28 @@ static int xgress_filter_add(struct bpf_tc_hook *qdisc_hook, goto fail; \ }) -static int netns_load_bpf (void ) +static int netns_load_bpf (const struct bpf_program *src_prog, +const struct bpf_program *dst_prog, +const struct bpf_program *chk_prog, +const struct netns_setup_result *setup_result) { -SYS ("tc qdisc add dev veth_src_fwd clsact" ); -SYS ("tc filter add dev veth_src_fwd ingress bpf da object-pinned " -SRC_PROG_PIN_FILE ); -SYS ("tc filter add dev veth_src_fwd egress bpf da object-pinned " -CHK_PROG_PIN_FILE ); - -SYS ("tc qdisc add dev veth_dst_fwd clsact" ); -SYS ("tc filter add dev veth_dst_fwd ingress bpf da object-pinned " -DST_PROG_PIN_FILE ); -SYS ("tc filter add dev veth_dst_fwd egress bpf da object-pinned " -CHK_PROG_PIN_FILE ); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_src_fwd); +LIBBPF_OPTS (bpf_tc_hook, qdisc_veth_dst_fwd); +int err; + +/* tc qdisc add dev veth_src_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_src_fwd, setup_result->ifindex_veth_src_fwd); +/* tc filter add dev veth_src_fwd ingress bpf da src_prog */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_INGRESS , src_prog,0 ); +/* tc filter add dev veth_src_fwd egress bpf da chk_prog */ +XGRESS_FILTER_ADD (&qdisc_veth_src_fwd,BPF_TC_EGRESS , chk_prog,0 ); + +/* tc qdisc add dev veth_dst_fwd clsact */ +QDISC_CLSACT_CREATE (&qdisc_veth_dst_fwd, setup_result->ifindex_veth_dst_fwd); +/* tc filter add dev veth_dst_fwd ingress bpf da dst_prog */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_INGRESS , dst_prog,0 ); +/* tc filter add dev veth_dst_fwd egress bpf da chk_prog */ +XGRESS_FILTER_ADD (&qdisc_veth_dst_fwd,BPF_TC_EGRESS , chk_prog,0 );return 0 ; fail:
@@ -829,7 +834,6 @@ static void test_tc_redirect_neigh_fib(struct netns_setup_result *setup_result) {struct nstoken *nstoken =NULL ;struct test_tc_neigh_fib *skel =NULL ; -int err; nstoken =open_netns (NS_FWD );if (!ASSERT_OK_PTR (nstoken,"setns fwd" ))
@@ -842,19 +846,8 @@ static void test_tc_redirect_neigh_fib(struct netns_setup_result *setup_result)if (!ASSERT_OK (test_tc_neigh_fib__load (skel),"test_tc_neigh_fib__load" )) goto done; - err =bpf_program__pin (skel->progs.tc_src,SRC_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " SRC_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_chk,CHK_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " CHK_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_dst,DST_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " DST_PROG_PIN_FILE )) - goto done; - -if (netns_load_bpf ()) +if (netns_load_bpf (skel->progs.tc_src, skel->progs.tc_dst, + skel->progs.tc_chk, setup_result)) goto done;/* bpf_fib_lookup() checks if forwarding is enabled */
@@ -890,19 +883,8 @@ static void test_tc_redirect_neigh(struct netns_setup_result *setup_result)if (!ASSERT_OK (err,"test_tc_neigh__load" )) goto done; - err =bpf_program__pin (skel->progs.tc_src,SRC_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " SRC_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_chk,CHK_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " CHK_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_dst,DST_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " DST_PROG_PIN_FILE )) - goto done; - -if (netns_load_bpf ()) +if (netns_load_bpf (skel->progs.tc_src, skel->progs.tc_dst, + skel->progs.tc_chk, setup_result)) goto done;if (!ASSERT_OK (set_forwarding (false),"disable forwarding" ))
@@ -937,19 +919,8 @@ static void test_tc_redirect_peer(struct netns_setup_result *setup_result)if (!ASSERT_OK (err,"test_tc_peer__load" )) goto done; - err =bpf_program__pin (skel->progs.tc_src,SRC_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " SRC_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_chk,CHK_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " CHK_PROG_PIN_FILE )) - goto done; - - err =bpf_program__pin (skel->progs.tc_dst,DST_PROG_PIN_FILE ); -if (!ASSERT_OK (err,"pin " DST_PROG_PIN_FILE )) - goto done; - -if (netns_load_bpf ()) +if (netns_load_bpf (skel->progs.tc_src, skel->progs.tc_dst, + skel->progs.tc_chk, setup_result)) goto done;if (!ASSERT_OK (set_forwarding (false),"disable forwarding" ))
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 5/7 selftests/bpf: Remove the "/sys" mount and umount dance in {open,close}_netns
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
The previous patches have removed the need to do the mount and umount dance when switching netns. In particular:
* Avoid remounting /sys/fs/bpf to have a clean start
* Avoid remounting /sys to get a ifindex of a particular netns
This patch can finally remove the mount and umount dance in {open,close}_netns which is unnecessarily complicated and error-prone.
--- tools/testing/selftests/bpf/network_helpers.c | 51 ++----------------- 1 file changed, 5 insertions(+), 46 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +5 -46
@@ -390,49 +390,6 @@ struct nstoken {int orig_netns_fd; }; -static int setns_by_fd (int nsfd) -{ -int err; - - err =setns (nsfd,CLONE_NEWNET ); -close (nsfd); - -if (!ASSERT_OK (err,"setns" )) -return err; - -/* Switch /sys to the new namespace so that e.g. /sys/class/net -* reflects the devices in the new namespace. -*/ - err =unshare (CLONE_NEWNS ); -if (!ASSERT_OK (err,"unshare" )) -return err; - -/* Make our /sys mount private, so the following umount won't -* trigger the global umount in case it's shared. -*/ - err =mount ("none" ,"/sys" ,NULL ,MS_PRIVATE ,NULL ); -if (!ASSERT_OK (err,"remount private /sys" )) -return err; - - err =umount2 ("/sys" ,MNT_DETACH ); -if (!ASSERT_OK (err,"umount2 /sys" )) -return err; - - err =mount ("sysfs" ,"/sys" ,"sysfs" ,0 ,NULL ); -if (!ASSERT_OK (err,"mount /sys" )) -return err; - - err =mount ("bpffs" ,"/sys/fs/bpf" ,"bpf" ,0 ,NULL ); -if (!ASSERT_OK (err,"mount /sys/fs/bpf" )) -return err; - - err =mount ("debugfs" ,"/sys/kernel/debug" ,"debugfs" ,0 ,NULL ); -if (!ASSERT_OK (err,"mount /sys/kernel/debug" )) -return err; - -return 0 ; -} -struct nstoken *open_netns (const char *name) {int nsfd;
@@ -453,8 +410,9 @@ struct nstoken *open_netns(const char *name)if (!ASSERT_GE (nsfd,0 ,"open netns fd" )) goto fail; - err =setns_by_fd (nsfd); -if (!ASSERT_OK (err,"setns_by_fd" )) + err =setns (nsfd,CLONE_NEWNET ); +close (nsfd); +if (!ASSERT_OK (err,"setns" )) goto fail;return token;
@@ -465,6 +423,7 @@ struct nstoken *open_netns(const char *name)void close_netns (struct nstoken *token) { -ASSERT_OK (setns_by_fd (token->orig_netns_fd),"setns_by_fd" ); +ASSERT_OK (setns (token->orig_netns_fd,CLONE_NEWNET ),"setns" ); +close (token->orig_netns_fd);free (token); }
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 6/7 selftests/bpf: Remove serial from tests using {open,close}_netns
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
After removing the mount/umount dance from {open,close}_netns() in the pervious patch, "serial_" can be removed from the tests using {open,close}_netns().
--- tools/testing/selftests/bpf/prog_tests/empty_skb.c | 2 +- tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- tools/testing/selftests/bpf/prog_tests/test_tunnel.c | 2 +- tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c | 2 +- tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/prog_tests/empty_skb.c +1 -1
@@ -9,7 +9,7 @@ goto out; \ }) -void serial_test_empty_skb (void ) +void test_empty_skb (void ) {LIBBPF_OPTS (bpf_test_run_opts, tattr);struct empty_skb *bpf_obj =NULL ;
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +1 -1
@@ -1138,7 +1138,7 @@ static void *test_tc_redirect_run_tests(void *arg)return NULL ; } -void serial_test_tc_redirect (void ) +void test_tc_redirect (void ) {pthread_t test_thread;int err;
tools/testing/selftests/bpf/prog_tests/test_tunnel.c +1 -1
@@ -421,7 +421,7 @@ static void *test_tunnel_run_tests(void *arg)return NULL ; } -void serial_test_tunnel (void ) +void test_tunnel (void ) {pthread_t test_thread;int err;
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +1 -1
@@ -85,7 +85,7 @@ static void test_max_pkt_size(int fd) }#define NUM_PKTS 10000 -void serial_test_xdp_do_redirect (void ) +void test_xdp_do_redirect (void ) {int err, xdp_prog_fd, tc_prog_fd, ifindex_src, ifindex_dst;char data[sizeof (pkt_udp) +sizeof (__u32)];
tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c +1 -1
@@ -174,7 +174,7 @@ static void test_synproxy(bool xdp)system ("ip netns del synproxy" ); } -void serial_test_xdp_synproxy (void ) +void test_xdp_synproxy (void ) {if (test__start_subtest ("xdp" ))test_synproxy (true);
Signature · 1 line
2.30.2
Martin KaFai Lau
reviewerPATCH 7/7 selftests/bpf: Avoid pinning prog when attaching to tc ingress in btf_skc_cls_ingress
In reply to Martin KaFai LauFrom: Martin KaFai Lau <[email protected]>
This patch removes the need to pin prog when attaching to tc ingress in the btf_skc_cls_ingress test. Instead, directly use the bpf_tc_hook_create() and bpf_tc_attach(). The qdisc clsact will go away together with the netns, so no need to bpf_tc_hook_destroy().
--- .../bpf/prog_tests/btf_skc_cls_ingress.c | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-)
tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +10 -15
@@ -9,6 +9,7 @@#include <string.h> #include <errno.h> #include <sched.h> +#include <net/if.h> #include <linux/compiler.h> #include <bpf/libbpf.h>
@@ -20,10 +21,12 @@ static struct test_btf_skc_cls_ingress *skel;static struct sockaddr_in6 srv_sa6;static __u32 duration; -#define PROG_PIN_FILE "/sys/fs/bpf/btf_skc_cls_ingress" -static int prepare_netns (void ) { + LIBBPF_OPTS(bpf_tc_hook, qdisc_lo, .attach_point = BPF_TC_INGRESS); +LIBBPF_OPTS (bpf_tc_opts, tc_attach, + .prog_fd = bpf_program__fd(skel->progs.cls_ingress)); +if (CHECK (unshare (CLONE_NEWNET ),"create netns" ,"unshare(CLONE_NEWNET): %s (%d)" ,strerror (errno), errno))
@@ -33,12 +36,12 @@ static int prepare_netns(void) "ip link set dev lo up", "failed\n"))return -1 ; -if (CHECK (system ("tc qdisc add dev lo clsact" ), -"tc qdisc add dev lo clsact" ,"failed\n" )) + qdisc_lo.ifindex =if_nametoindex ("lo" ); +if (!ASSERT_OK (bpf_tc_hook_create (&qdisc_lo),"qdisc add dev lo clsact" ))return -1 ; -if (CHECK (system ("tc filter add dev lo ingress bpf direct-action object-pinned " PROG_PIN_FILE ), -"install tc cls-prog at ingress" ,"failed\n" )) +if (!ASSERT_OK (bpf_tc_attach (&qdisc_lo, &tc_attach), +"filter add dev lo ingress" ))return -1 ;/* Ensure 20 bytes options (i.e. in total 40 bytes tcp header) for the
@@ -195,19 +198,12 @@ static struct test tests[] = {void test_btf_skc_cls_ingress (void ) { -int i, err; +int i; skel =test_btf_skc_cls_ingress__open_and_load ();if (CHECK (!skel,"test_btf_skc_cls_ingress__open_and_load" ,"failed\n" ))return ; - err =bpf_program__pin (skel->progs.cls_ingress,PROG_PIN_FILE ); -if (CHECK (err,"bpf_program__pin" , -"cannot pin bpf prog to %s. err:%d\n" ,PROG_PIN_FILE , err)) { -test_btf_skc_cls_ingress__destroy (skel); -return ; - } -for (i =0 ; i <ARRAY_SIZE (tests); i++) {if (!test__start_subtest (tests[i].desc))continue ;
@@ -221,6 +217,5 @@ void test_btf_skc_cls_ingress(void)reset_test (); } -bpf_program__unpin (skel->progs.cls_ingress,PROG_PIN_FILE );test_btf_skc_cls_ingress__destroy (skel); }
Signature · 1 line
2.30.2
Quoted 5 lines · Martin KaFai Lau
From: Martin KaFai Lau <[email protected]>
Some of the tests do mount/umount dance when switching netns.
It is error-prone like https://lore.kernel.org/bpf/[email protected]/
Quoted 7 lines
Another issue is, there are many left over after running some of the tests:
#> mount | egrep sysfs | wc -l
19Instead of further debugging this dance, this set is to avoid the needs to do this remounting altogether. It will then allow those tests to be run in parallel again.
Looks great, thank you for taking care of this! Since I'm partly to blame for the mess, took a quick look at the series:
Quoted 23 lines
Martin KaFai Lau (7):
selftests/bpf: Useif_nametoindexinstead of reading the
/sys/net/class/*/ifindex
selftests/bpf: Avoid pinning bpf prog in thetc_redirect_dtimetest selftests/bpf: Avoid pinning bpf prog in thetc_redirect_peer_l3test selftests/bpf: Avoid pinning bpf prog in thenetns_load_bpf()callers selftests/bpf: Remove the "/sys" mount and umount dance in
{open,close}_netns
selftests/bpf: Remove serial from tests using {open,close}_netns selftests/bpf: Avoid pinning prog when attaching to tc ingress in
btf_skc_cls_ingresstools/testing/selftests/bpf/network_helpers.c | 51 +-- .../bpf/prog_tests/btf_skc_cls_ingress.c | 25 +- .../selftests/bpf/prog_tests/empty_skb.c | 2 +- .../selftests/bpf/prog_tests/tc_redirect.c | 314 +++++++++--------- .../selftests/bpf/prog_tests/test_tunnel.c | 2 +- .../bpf/prog_tests/xdp_do_redirect.c | 2 +- .../selftests/bpf/prog_tests/xdp_synproxy.c | 2 +- 7 files changed, 178 insertions(+), 220 deletions(-)--
2.30.2
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 10 lines · On Mon, 28 Nov 2022 23:08:53 -0800 you wrote:
From: Martin KaFai Lau <[email protected]>
Some of the tests do mount/umount dance when switching netns.
It is error-prone like https://lore.kernel.org/bpf/[email protected]/Another issue is, there are many left over after running some of the tests:
#> mount | egrep sysfs | wc -l
19[...]
Here is the summary with links:
- [bpf-next,1/7] selftests/bpf: Use if_nametoindex instead of reading the /sys/net/class/*/ifindex
https://git.kernel.org/bpf/bpf-next/c/052c82dcdcbb - [bpf-next,2/7] selftests/bpf: Avoid pinning bpf prog in the tc_redirect_dtime test https://git.kernel.org/bpf/bpf-next/c/57d0863f1d28 - [bpf-next,3/7] selftests/bpf: Avoid pinning bpf prog in the tc_redirect_peer_l3 test https://git.kernel.org/bpf/bpf-next/c/f1b73577bb3c - [bpf-next,4/7] selftests/bpf: Avoid pinning bpf prog in the netns_load_bpf() callers https://git.kernel.org/bpf/bpf-next/c/5dc42a7fc286 - [bpf-next,5/7] selftests/bpf: Remove the "/sys" mount and umount dance in {open,close}_netns https://git.kernel.org/bpf/bpf-next/c/3084097c369c - [bpf-next,6/7] selftests/bpf: Remove serial from tests using {open,close}_netns https://git.kernel.org/bpf/bpf-next/c/9b6a77739737 - [bpf-next,7/7] selftests/bpf: Avoid pinning prog when attaching to tc ingress in btf_skc_cls_ingress https://git.kernel.org/bpf/bpf-next/c/443f216448ab
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html