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

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



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

Add a new test in test_progs to test erspan tunnels. It uses the same
network topology and the same BPF programs than the script.
Remove test_erspan() 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-5-8329f38f0678@bootlin.com


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

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

+46 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ 
#define IP6GRE_TUNL_DEV0 "ip6gre00"

#define IP6GRE_TUNL_DEV1 "ip6gre11"



#define ERSPAN_TUNL_DEV0 "erspan00"

#define ERSPAN_TUNL_DEV1 "erspan11"



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



static int config_device(void)
@@ -872,6 +875,47 @@ static void test_ip6gre_tunnel(enum ip6gre_test test) 
	test_tunnel_kern__destroy(skel);

}



enum erspan_test {

	V1,

	V2

};



static void test_erspan_tunnel(enum erspan_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;



	switch (test) {

	case V1:

		err = add_ipv4_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1,

				      "erspan", "seq key 2 erspan_ver 1 erspan 123");

		break;

	case V2:

		err = add_ipv4_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1,

				      "erspan",

				      "seq key 2 erspan_ver 2 erspan_dir egress erspan_hwid 3");

		break;

	}

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

		goto done;



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

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

	if (generic_attach(ERSPAN_TUNL_DEV1, get_fd, set_fd))

		goto done;



	ping_dev0();

	ping_dev1();

done:

	delete_tunnel(ERSPAN_TUNL_DEV0, ERSPAN_TUNL_DEV1);

	test_tunnel_kern__destroy(skel);

}



#define RUN_TEST(name, ...)						\

	({								\

		if (test__start_subtest(#name)) {			\
@@ -895,6 +939,8 @@ static void *test_tunnel_run_tests(void *arg) 
	RUN_TEST(gre_tunnel, GRETAP_NOKEY);

	RUN_TEST(ip6gre_tunnel, IP6GRE);

	RUN_TEST(ip6gre_tunnel, IP6GRETAP);

	RUN_TEST(erspan_tunnel, V1);

	RUN_TEST(erspan_tunnel, V2);



	return NULL;

}

tools/testing/selftests/bpf/test_tunnel.sh

+0 −52
Original line number Diff line number Diff line
@@ -64,29 +64,6 @@ config_device() 
	ip addr add dev veth1 172.16.1.200/24

}



add_erspan_tunnel()

{

	# at_ns0 namespace

	if [ "$1" == "v1" ]; then

		ip netns exec at_ns0 \

		ip link add dev $DEV_NS type $TYPE seq key 2 \

		local 172.16.1.100 remote 172.16.1.200 \

		erspan_ver 1 erspan 123

	else

		ip netns exec at_ns0 \

		ip link add dev $DEV_NS type $TYPE seq key 2 \

		local 172.16.1.100 remote 172.16.1.200 \

		erspan_ver 2 erspan_dir egress erspan_hwid 3

	fi

	ip netns exec at_ns0 ip link set dev $DEV_NS up

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



	# root namespace

	ip link add dev $DEV type $TYPE external

	ip link set dev $DEV up

	ip addr add dev $DEV 10.1.1.200/24

}



add_ip6erspan_tunnel()

{
@@ -189,30 +166,6 @@ add_ip6tnl_tunnel() 
	ip link set dev $DEV up

}



test_erspan()

{

	TYPE=erspan

	DEV_NS=erspan00

	DEV=erspan11

	ret=0



	check $TYPE

	config_device

	add_erspan_tunnel $1

	attach_bpf $DEV erspan_set_tunnel erspan_get_tunnel

	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_ip6erspan()

{

	TYPE=ip6erspan
@@ -388,7 +341,6 @@ cleanup() 
	ip link del ip6ip6tnl11 2> /dev/null

	ip link del geneve11 2> /dev/null

	ip link del ip6geneve11 2> /dev/null

	ip link del erspan11 2> /dev/null

	ip link del ip6erspan11 2> /dev/null

}
@@ -426,10 +378,6 @@ bpf_tunnel_test() 
{

	local errors=0



	echo "Testing ERSPAN tunnel..."

	test_erspan v2

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



	echo "Testing IP6ERSPAN tunnel..."

	test_ip6erspan v2

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