Commit 05cd60ab authored by Bastien Curutchet (eBPF Foundation)'s avatar Bastien Curutchet (eBPF Foundation) Committed by Alexei Starovoitov
Browse files

selftests/bpf: test_tunnel: Move ip6tnl tunnel tests to test_progs 



ip6tnl tunnels are tested in the test_tunnel.sh but not in the test_progs
framework.

Add a new test in test_progs to test ip6tnl tunnels. It uses the same
network topology and the same BPF programs than the script.
Remove test_ipip6() and test_ip6ip6() from the script.

Signed-off-by: default avatarBastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Acked-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250303-tunnels-v2-9-8329f38f0678@bootlin.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 260f2da6

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

+59 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ 
#define IP6GENEVE_TUNL_DEV0 "ip6geneve00"

#define IP6GENEVE_TUNL_DEV1 "ip6geneve11"



#define IP6TNL_TUNL_DEV0 "ip6tnl00"

#define IP6TNL_TUNL_DEV1 "ip6tnl11"



#define PING_ARGS "-i 0.01 -c 3 -w 10 -q"



static int config_device(void)
@@ -513,6 +516,11 @@ static void ping6_veth0(void) 
	test_ping(AF_INET6, IP6_ADDR_VETH0);

}



static void ping6_dev0(void)

{

	test_ping(AF_INET6, IP6_ADDR_TUNL_DEV0);

}



static void ping6_dev1(void)

{

	struct nstoken *nstoken;
@@ -1046,6 +1054,55 @@ static void test_ip6geneve_tunnel(void) 
	test_tunnel_kern__destroy(skel);

}



enum ip6tnl_test {

	IPIP6,

	IP6IP6

};



static void test_ip6tnl_tunnel(enum ip6tnl_test test)

{

	struct test_tunnel_kern *skel;

	int set_fd, get_fd;

	int err;



	skel = test_tunnel_kern__open_and_load();

	if (!ASSERT_OK_PTR(skel, "test_tunnel_kern__open_and_load"))

		return;



	err = add_ipv6_tunnel(IP6TNL_TUNL_DEV0, IP6TNL_TUNL_DEV1, "ip6tnl", "");

	if (!ASSERT_OK(err, "add tunnel"))

		goto done;



	switch (test) {

	case IPIP6:

		set_fd = bpf_program__fd(skel->progs.ipip6_set_tunnel);

		get_fd = bpf_program__fd(skel->progs.ipip6_get_tunnel);

		break;

	case IP6IP6:

		set_fd = bpf_program__fd(skel->progs.ip6ip6_set_tunnel);

		get_fd = bpf_program__fd(skel->progs.ip6ip6_get_tunnel);

		break;

	}

	if (generic_attach(IP6TNL_TUNL_DEV1, get_fd, set_fd))

		goto done;



	ping6_veth0();

	switch (test) {

	case IPIP6:

		ping_dev0();

		ping_dev1();

		break;

	case IP6IP6:

		ping6_dev0();

		ping6_dev1();

		break;

	}



done:

	delete_tunnel(IP6TNL_TUNL_DEV0, IP6TNL_TUNL_DEV1);

	test_tunnel_kern__destroy(skel);

}



#define RUN_TEST(name, ...)						\

	({								\

		if (test__start_subtest(#name)) {			\
@@ -1075,6 +1132,8 @@ static void *test_tunnel_run_tests(void *arg) 
	RUN_TEST(ip6erspan_tunnel, V2);

	RUN_TEST(geneve_tunnel);

	RUN_TEST(ip6geneve_tunnel);

	RUN_TEST(ip6tnl_tunnel, IPIP6);

	RUN_TEST(ip6tnl_tunnel, IP6IP6);



	return NULL;

}

tools/testing/selftests/bpf/test_tunnel.sh

+0 −88
Original line number Diff line number Diff line
@@ -79,28 +79,6 @@ add_ipip_tunnel() 
	ip addr add dev $DEV 10.1.1.200/24

}



add_ip6tnl_tunnel()

{

	ip netns exec at_ns0 ip addr add ::11/96 dev veth0

	ip netns exec at_ns0 ip link set dev veth0 up

	ip addr add dev veth1 ::22/96

	ip link set dev veth1 up



	# at_ns0 namespace

	ip netns exec at_ns0 \

		ip link add dev $DEV_NS type $TYPE \

		local ::11 remote ::22

	ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24

	ip netns exec at_ns0 ip addr add dev $DEV_NS 1::11/96

	ip netns exec at_ns0 ip link set dev $DEV_NS up



	# root namespace

	ip link add dev $DEV type $TYPE external

	ip addr add dev $DEV 10.1.1.200/24

	ip addr add dev $DEV 1::22/96

	ip link set dev $DEV up

}



test_ipip()

{

	TYPE=ipip
@@ -126,62 +104,6 @@ test_ipip() 
        echo -e ${GREEN}"PASS: $TYPE"${NC}

}



test_ipip6()

{

	TYPE=ip6tnl

	DEV_NS=ipip6tnl00

	DEV=ipip6tnl11

	ret=0



	check $TYPE

	config_device

	add_ip6tnl_tunnel

	ip link set dev veth1 mtu 1500

	attach_bpf $DEV ipip6_set_tunnel ipip6_get_tunnel

	# underlay

	ping6 $PING_ARG ::11

	# ip4 over ip6

	ping $PING_ARG 10.1.1.100

	check_err $?

	ip netns exec at_ns0 ping $PING_ARG 10.1.1.200

	check_err $?

	cleanup



	if [ $ret -ne 0 ]; then

                echo -e ${RED}"FAIL: $TYPE"${NC}

                return 1

        fi

        echo -e ${GREEN}"PASS: $TYPE"${NC}

}



test_ip6ip6()

{

	TYPE=ip6tnl

	DEV_NS=ip6ip6tnl00

	DEV=ip6ip6tnl11

	ret=0



	check $TYPE

	config_device

	add_ip6tnl_tunnel

	ip link set dev veth1 mtu 1500

	attach_bpf $DEV ip6ip6_set_tunnel ip6ip6_get_tunnel

	# underlay

	ping6 $PING_ARG ::11

	# ip6 over ip6

	ping6 $PING_ARG 1::11

	check_err $?

	ip netns exec at_ns0 ping6 $PING_ARG 1::22

	check_err $?

	cleanup



	if [ $ret -ne 0 ]; then

                echo -e ${RED}"FAIL: ip6$TYPE"${NC}

                return 1

        fi

        echo -e ${GREEN}"PASS: ip6$TYPE"${NC}

}



attach_bpf()

{

	DEV=$1
@@ -201,8 +123,6 @@ cleanup() 
	ip netns delete at_ns0 2> /dev/null

	ip link del veth1 2> /dev/null

	ip link del ipip11 2> /dev/null

	ip link del ipip6tnl11 2> /dev/null

	ip link del ip6ip6tnl11 2> /dev/null

}



cleanup_exit()
@@ -242,14 +162,6 @@ bpf_tunnel_test() 
	test_ipip

	errors=$(( $errors + $? ))



	echo "Testing IPIP6 tunnel..."

	test_ipip6

	errors=$(( $errors + $? ))



	echo "Testing IP6IP6 tunnel..."

	test_ip6ip6

	errors=$(( $errors + $? ))



	return $errors

}