Commit 68bfd65f authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'move SYS() macro to test_progs.h and run mptcp in a dedicated netns' 



Hangbin Liu says:

====================

As Martin suggested, let's move the SYS() macro to test_progs.h since
a lot of programs are using it. After that, let's run mptcp in a dedicated
netns to avoid user config influence.

v3: fix fd redirect typo. Move SYS() macro into the test_progs.h
v2: remove unneed close_cgroup_fd goto label.
====================

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents d0093aae 02d6a057

tools/testing/selftests/bpf/prog_tests/decap_sanity.c

+4 −12
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ 
#include "network_helpers.h"

#include "decap_sanity.skel.h"



#define SYS(fmt, ...)						\

	({							\

		char cmd[1024];					\

		snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__);	\

		if (!ASSERT_OK(system(cmd), cmd))		\

			goto fail;				\

	})



#define NS_TEST "decap_sanity_ns"

#define IPV6_IFACE_ADDR "face::1"

#define UDP_TEST_PORT 7777
@@ -37,9 +29,9 @@ void test_decap_sanity(void) 
	if (!ASSERT_OK_PTR(skel, "skel open_and_load"))

		return;



	SYS("ip netns add %s", NS_TEST);

	SYS("ip -net %s -6 addr add %s/128 dev lo nodad", NS_TEST, IPV6_IFACE_ADDR);

	SYS("ip -net %s link set dev lo up", NS_TEST);

	SYS(fail, "ip netns add %s", NS_TEST);

	SYS(fail, "ip -net %s -6 addr add %s/128 dev lo nodad", NS_TEST, IPV6_IFACE_ADDR);

	SYS(fail, "ip -net %s link set dev lo up", NS_TEST);



	nstoken = open_netns(NS_TEST);

	if (!ASSERT_OK_PTR(nstoken, "open_netns"))
@@ -80,6 +72,6 @@ void test_decap_sanity(void) 
		bpf_tc_hook_destroy(&qdisc_hook);

		close_netns(nstoken);

	}

	system("ip netns del " NS_TEST " &> /dev/null");

	SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");

	decap_sanity__destroy(skel);

}

tools/testing/selftests/bpf/prog_tests/empty_skb.c

+10 −15
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ 
#include <net/if.h>

#include "empty_skb.skel.h"



#define SYS(cmd) ({ \

	if (!ASSERT_OK(system(cmd), (cmd))) \

		goto out; \

})



void test_empty_skb(void)

{

	LIBBPF_OPTS(bpf_test_run_opts, tattr);
@@ -93,18 +88,18 @@ void test_empty_skb(void) 
		},

	};



	SYS("ip netns add empty_skb");

	SYS(out, "ip netns add empty_skb");

	tok = open_netns("empty_skb");

	SYS("ip link add veth0 type veth peer veth1");

	SYS("ip link set dev veth0 up");

	SYS("ip link set dev veth1 up");

	SYS("ip addr add 10.0.0.1/8 dev veth0");

	SYS("ip addr add 10.0.0.2/8 dev veth1");

	SYS(out, "ip link add veth0 type veth peer veth1");

	SYS(out, "ip link set dev veth0 up");

	SYS(out, "ip link set dev veth1 up");

	SYS(out, "ip addr add 10.0.0.1/8 dev veth0");

	SYS(out, "ip addr add 10.0.0.2/8 dev veth1");

	veth_ifindex = if_nametoindex("veth0");



	SYS("ip link add ipip0 type ipip local 10.0.0.1 remote 10.0.0.2");

	SYS("ip link set ipip0 up");

	SYS("ip addr add 192.168.1.1/16 dev ipip0");

	SYS(out, "ip link add ipip0 type ipip local 10.0.0.1 remote 10.0.0.2");

	SYS(out, "ip link set ipip0 up");

	SYS(out, "ip addr add 192.168.1.1/16 dev ipip0");

	ipip_ifindex = if_nametoindex("ipip0");



	bpf_obj = empty_skb__open_and_load();
@@ -142,5 +137,5 @@ void test_empty_skb(void) 
		empty_skb__destroy(bpf_obj);

	if (tok)

		close_netns(tok);

	system("ip netns del empty_skb");

	SYS_NOFAIL("ip netns del empty_skb");

}

tools/testing/selftests/bpf/prog_tests/fib_lookup.c

+10 −18
Original line number Diff line number Diff line
@@ -8,14 +8,6 @@ 
#include "network_helpers.h"

#include "fib_lookup.skel.h"



#define SYS(fmt, ...)						\

	({							\

		char cmd[1024];					\

		snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__);	\

		if (!ASSERT_OK(system(cmd), cmd))		\

			goto fail;				\

	})



#define NS_TEST			"fib_lookup_ns"

#define IPV6_IFACE_ADDR		"face::face"

#define IPV6_NUD_FAILED_ADDR	"face::1"
@@ -59,16 +51,16 @@ static int setup_netns(void) 
{

	int err;



	SYS("ip link add veth1 type veth peer name veth2");

	SYS("ip link set dev veth1 up");

	SYS(fail, "ip link add veth1 type veth peer name veth2");

	SYS(fail, "ip link set dev veth1 up");



	SYS("ip addr add %s/64 dev veth1 nodad", IPV6_IFACE_ADDR);

	SYS("ip neigh add %s dev veth1 nud failed", IPV6_NUD_FAILED_ADDR);

	SYS("ip neigh add %s dev veth1 lladdr %s nud stale", IPV6_NUD_STALE_ADDR, DMAC);

	SYS(fail, "ip addr add %s/64 dev veth1 nodad", IPV6_IFACE_ADDR);

	SYS(fail, "ip neigh add %s dev veth1 nud failed", IPV6_NUD_FAILED_ADDR);

	SYS(fail, "ip neigh add %s dev veth1 lladdr %s nud stale", IPV6_NUD_STALE_ADDR, DMAC);



	SYS("ip addr add %s/24 dev veth1 nodad", IPV4_IFACE_ADDR);

	SYS("ip neigh add %s dev veth1 nud failed", IPV4_NUD_FAILED_ADDR);

	SYS("ip neigh add %s dev veth1 lladdr %s nud stale", IPV4_NUD_STALE_ADDR, DMAC);

	SYS(fail, "ip addr add %s/24 dev veth1 nodad", IPV4_IFACE_ADDR);

	SYS(fail, "ip neigh add %s dev veth1 nud failed", IPV4_NUD_FAILED_ADDR);

	SYS(fail, "ip neigh add %s dev veth1 lladdr %s nud stale", IPV4_NUD_STALE_ADDR, DMAC);



	err = write_sysctl("/proc/sys/net/ipv4/conf/veth1/forwarding", "1");

	if (!ASSERT_OK(err, "write_sysctl(net.ipv4.conf.veth1.forwarding)"))
@@ -140,7 +132,7 @@ void test_fib_lookup(void) 
		return;

	prog_fd = bpf_program__fd(skel->progs.fib_lookup);



	SYS("ip netns add %s", NS_TEST);

	SYS(fail, "ip netns add %s", NS_TEST);



	nstoken = open_netns(NS_TEST);

	if (!ASSERT_OK_PTR(nstoken, "open_netns"))
@@ -182,6 +174,6 @@ void test_fib_lookup(void) 
fail:

	if (nstoken)

		close_netns(nstoken);

	system("ip netns del " NS_TEST " &> /dev/null");

	SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");

	fib_lookup__destroy(skel);

}

tools/testing/selftests/bpf/prog_tests/mptcp.c

+17 −2
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#include "network_helpers.h"

#include "mptcp_sock.skel.h"



#define NS_TEST "mptcp_ns"



#ifndef TCP_CA_NAME_MAX

#define TCP_CA_NAME_MAX	16

#endif
@@ -138,12 +140,20 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp) 


static void test_base(void)

{

	struct nstoken *nstoken = NULL;

	int server_fd, cgroup_fd;



	cgroup_fd = test__join_cgroup("/mptcp");

	if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))

		return;



	SYS(fail, "ip netns add %s", NS_TEST);

	SYS(fail, "ip -net %s link set dev lo up", NS_TEST);



	nstoken = open_netns(NS_TEST);

	if (!ASSERT_OK_PTR(nstoken, "open_netns"))

		goto fail;



	/* without MPTCP */

	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);

	if (!ASSERT_GE(server_fd, 0, "start_server"))
@@ -157,13 +167,18 @@ static void test_base(void) 
	/* with MPTCP */

	server_fd = start_mptcp_server(AF_INET, NULL, 0, 0);

	if (!ASSERT_GE(server_fd, 0, "start_mptcp_server"))

		goto close_cgroup_fd;

		goto fail;



	ASSERT_OK(run_test(cgroup_fd, server_fd, true), "run_test mptcp");



	close(server_fd);



close_cgroup_fd:

fail:

	if (nstoken)

		close_netns(nstoken);



	SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");



	close(cgroup_fd);

}

tools/testing/selftests/bpf/prog_tests/tc_redirect.c

+46 −54
Original line number Diff line number Diff line
@@ -137,24 +137,16 @@ static int get_ifaddr(const char *name, char *ifaddr) 
	return 0;

}



#define SYS(fmt, ...)						\

	({							\

		char cmd[1024];					\

		snprintf(cmd, sizeof(cmd), fmt, ##__VA_ARGS__);	\

		if (!ASSERT_OK(system(cmd), cmd))		\

			goto fail;				\

	})



static int netns_setup_links_and_routes(struct netns_setup_result *result)

{

	struct nstoken *nstoken = NULL;

	char veth_src_fwd_addr[IFADDR_STR_LEN+1] = {};



	SYS("ip link add veth_src type veth peer name veth_src_fwd");

	SYS("ip link add veth_dst type veth peer name veth_dst_fwd");

	SYS(fail, "ip link add veth_src type veth peer name veth_src_fwd");

	SYS(fail, "ip link add veth_dst type veth peer name veth_dst_fwd");



	SYS("ip link set veth_dst_fwd address " MAC_DST_FWD);

	SYS("ip link set veth_dst address " MAC_DST);

	SYS(fail, "ip link set veth_dst_fwd address " MAC_DST_FWD);

	SYS(fail, "ip link set veth_dst address " MAC_DST);



	if (get_ifaddr("veth_src_fwd", veth_src_fwd_addr))

		goto fail;
@@ -175,27 +167,27 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result) 
	if (!ASSERT_GT(result->ifindex_veth_dst_fwd, 0, "ifindex_veth_dst_fwd"))

		goto fail;



	SYS("ip link set veth_src netns " NS_SRC);

	SYS("ip link set veth_src_fwd netns " NS_FWD);

	SYS("ip link set veth_dst_fwd netns " NS_FWD);

	SYS("ip link set veth_dst netns " NS_DST);

	SYS(fail, "ip link set veth_src netns " NS_SRC);

	SYS(fail, "ip link set veth_src_fwd netns " NS_FWD);

	SYS(fail, "ip link set veth_dst_fwd netns " NS_FWD);

	SYS(fail, "ip link set veth_dst netns " NS_DST);



	/** setup in 'src' namespace */

	nstoken = open_netns(NS_SRC);

	if (!ASSERT_OK_PTR(nstoken, "setns src"))

		goto fail;



	SYS("ip addr add " IP4_SRC "/32 dev veth_src");

	SYS("ip addr add " IP6_SRC "/128 dev veth_src nodad");

	SYS("ip link set dev veth_src up");

	SYS(fail, "ip addr add " IP4_SRC "/32 dev veth_src");

	SYS(fail, "ip addr add " IP6_SRC "/128 dev veth_src nodad");

	SYS(fail, "ip link set dev veth_src up");



	SYS("ip route add " IP4_DST "/32 dev veth_src scope global");

	SYS("ip route add " IP4_NET "/16 dev veth_src scope global");

	SYS("ip route add " IP6_DST "/128 dev veth_src scope global");

	SYS(fail, "ip route add " IP4_DST "/32 dev veth_src scope global");

	SYS(fail, "ip route add " IP4_NET "/16 dev veth_src scope global");

	SYS(fail, "ip route add " IP6_DST "/128 dev veth_src scope global");



	SYS("ip neigh add " IP4_DST " dev veth_src lladdr %s",

	SYS(fail, "ip neigh add " IP4_DST " dev veth_src lladdr %s",

	    veth_src_fwd_addr);

	SYS("ip neigh add " IP6_DST " dev veth_src lladdr %s",

	SYS(fail, "ip neigh add " IP6_DST " dev veth_src lladdr %s",

	    veth_src_fwd_addr);



	close_netns(nstoken);
@@ -209,15 +201,15 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result) 
	 * needs v4 one in order to start ARP probing. IP4_NET route is added

	 * to the endpoints so that the ARP processing will reply.

	 */

	SYS("ip addr add " IP4_SLL "/32 dev veth_src_fwd");

	SYS("ip addr add " IP4_DLL "/32 dev veth_dst_fwd");

	SYS("ip link set dev veth_src_fwd up");

	SYS("ip link set dev veth_dst_fwd up");

	SYS(fail, "ip addr add " IP4_SLL "/32 dev veth_src_fwd");

	SYS(fail, "ip addr add " IP4_DLL "/32 dev veth_dst_fwd");

	SYS(fail, "ip link set dev veth_src_fwd up");

	SYS(fail, "ip link set dev veth_dst_fwd up");



	SYS("ip route add " IP4_SRC "/32 dev veth_src_fwd scope global");

	SYS("ip route add " IP6_SRC "/128 dev veth_src_fwd scope global");

	SYS("ip route add " IP4_DST "/32 dev veth_dst_fwd scope global");

	SYS("ip route add " IP6_DST "/128 dev veth_dst_fwd scope global");

	SYS(fail, "ip route add " IP4_SRC "/32 dev veth_src_fwd scope global");

	SYS(fail, "ip route add " IP6_SRC "/128 dev veth_src_fwd scope global");

	SYS(fail, "ip route add " IP4_DST "/32 dev veth_dst_fwd scope global");

	SYS(fail, "ip route add " IP6_DST "/128 dev veth_dst_fwd scope global");



	close_netns(nstoken);
@@ -226,16 +218,16 @@ static int netns_setup_links_and_routes(struct netns_setup_result *result) 
	if (!ASSERT_OK_PTR(nstoken, "setns dst"))

		goto fail;



	SYS("ip addr add " IP4_DST "/32 dev veth_dst");

	SYS("ip addr add " IP6_DST "/128 dev veth_dst nodad");

	SYS("ip link set dev veth_dst up");

	SYS(fail, "ip addr add " IP4_DST "/32 dev veth_dst");

	SYS(fail, "ip addr add " IP6_DST "/128 dev veth_dst nodad");

	SYS(fail, "ip link set dev veth_dst up");



	SYS("ip route add " IP4_SRC "/32 dev veth_dst scope global");

	SYS("ip route add " IP4_NET "/16 dev veth_dst scope global");

	SYS("ip route add " IP6_SRC "/128 dev veth_dst scope global");

	SYS(fail, "ip route add " IP4_SRC "/32 dev veth_dst scope global");

	SYS(fail, "ip route add " IP4_NET "/16 dev veth_dst scope global");

	SYS(fail, "ip route add " IP6_SRC "/128 dev veth_dst scope global");



	SYS("ip neigh add " IP4_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS("ip neigh add " IP6_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS(fail, "ip neigh add " IP4_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS(fail, "ip neigh add " IP6_SRC " dev veth_dst lladdr " MAC_DST_FWD);



	close_netns(nstoken);
@@ -375,7 +367,7 @@ static void test_tcp(int family, const char *addr, __u16 port) 


static int test_ping(int family, const char *addr)

{

	SYS("ip netns exec " NS_SRC " %s " PING_ARGS " %s > /dev/null", ping_command(family), addr);

	SYS(fail, "ip netns exec " NS_SRC " %s " PING_ARGS " %s > /dev/null", ping_command(family), addr);

	return 0;

fail:

	return -1;
@@ -953,7 +945,7 @@ static int tun_open(char *name) 
	if (!ASSERT_OK(err, "ioctl TUNSETIFF"))

		goto fail;



	SYS("ip link set dev %s up", name);

	SYS(fail, "ip link set dev %s up", name);



	return fd;

fail:
@@ -1076,23 +1068,23 @@ static void test_tc_redirect_peer_l3(struct netns_setup_result *setup_result) 
	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");

	SYS("ip -netns " NS_FWD " addr add dev tun_fwd " IP4_TUN_FWD "/24");

	SYS(fail, "ip -netns " NS_SRC " addr add dev tun_src " IP4_TUN_SRC "/24");

	SYS(fail, "ip -netns " NS_FWD " addr add dev tun_fwd " IP4_TUN_FWD "/24");



	SYS("ip -netns " NS_SRC " addr add dev tun_src " IP6_TUN_SRC "/64 nodad");

	SYS("ip -netns " NS_FWD " addr add dev tun_fwd " IP6_TUN_FWD "/64 nodad");

	SYS(fail, "ip -netns " NS_SRC " addr add dev tun_src " IP6_TUN_SRC "/64 nodad");

	SYS(fail, "ip -netns " NS_FWD " addr add dev tun_fwd " IP6_TUN_FWD "/64 nodad");



	SYS("ip -netns " NS_SRC " route del " IP4_DST "/32 dev veth_src scope global");

	SYS("ip -netns " NS_SRC " route add " IP4_DST "/32 via " IP4_TUN_FWD

	SYS(fail, "ip -netns " NS_SRC " route del " IP4_DST "/32 dev veth_src scope global");

	SYS(fail, "ip -netns " NS_SRC " route add " IP4_DST "/32 via " IP4_TUN_FWD

	    " dev tun_src scope global");

	SYS("ip -netns " NS_DST " route add " IP4_TUN_SRC "/32 dev veth_dst scope global");

	SYS("ip -netns " NS_SRC " route del " IP6_DST "/128 dev veth_src scope global");

	SYS("ip -netns " NS_SRC " route add " IP6_DST "/128 via " IP6_TUN_FWD

	SYS(fail, "ip -netns " NS_DST " route add " IP4_TUN_SRC "/32 dev veth_dst scope global");

	SYS(fail, "ip -netns " NS_SRC " route del " IP6_DST "/128 dev veth_src scope global");

	SYS(fail, "ip -netns " NS_SRC " route add " IP6_DST "/128 via " IP6_TUN_FWD

	    " dev tun_src scope global");

	SYS("ip -netns " NS_DST " route add " IP6_TUN_SRC "/128 dev veth_dst scope global");

	SYS(fail, "ip -netns " NS_DST " route add " IP6_TUN_SRC "/128 dev veth_dst scope global");



	SYS("ip -netns " NS_DST " neigh add " IP4_TUN_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS("ip -netns " NS_DST " neigh add " IP6_TUN_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS(fail, "ip -netns " NS_DST " neigh add " IP4_TUN_SRC " dev veth_dst lladdr " MAC_DST_FWD);

	SYS(fail, "ip -netns " NS_DST " neigh add " IP6_TUN_SRC " dev veth_dst lladdr " MAC_DST_FWD);



	if (!ASSERT_OK(set_forwarding(false), "disable forwarding"))

		goto fail;