Commit dad704eb authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'selftests-bpf-migrate-test_xdp_meta-sh-to-test_progs' 

Bastien Curutchet says:

====================
This patch series continues the work to migrate the script tests into
prog_tests.

test_xdp_meta.sh uses the BPF programs defined in progs/test_xdp_meta.c
to do a simple XDP/TC functional test that checks the metadata
allocation performed by the bpf_xdp_adjust_meta() helper.

This is already partly covered by two tests under prog_tests/:
- xdp_context_test_run.c uses bpf_prog_test_run_opts() to verify the
validity of the xdp_md context after a call to bpf_xdp_adjust_meta()
- xdp_metadata.c ensures that these meta-data can be exchanged through
an AF_XDP socket.

However test_xdp_meta.sh also verifies that the meta-data initialized
in the struct xdp_md is forwarded to the struct __sk_buff used by BPF
programs at 'TC level'. To cover this, I add a test case in
xdp_context_test_run.c that uses the same BPF programs from
progs/test_xdp_meta.c.

Changes in v2:
- Add missing close_netns()
- Use a unique 'close' label
- Link to v1: https://lore.kernel.org/r/20241206-xdp_meta-v1-0-5c150618f6e9@bootlin.com

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

Link: https://patch.msgid.link/20241213-xdp_meta-v2-0-634582725b90@bootlin.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents 2309132f df539cef

tools/testing/selftests/bpf/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ TEST_FILES = xsk_prereqs.sh $(wildcard progs/btf_dump_test_case_*.c) 
TEST_PROGS := test_kmod.sh \

	test_xdp_redirect.sh \

	test_xdp_redirect_multi.sh \

	test_xdp_meta.sh \

	test_tunnel.sh \

	test_lwt_seg6local.sh \

	test_lirc_mode2.sh \

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

+87 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ 
#include <test_progs.h>

#include <network_helpers.h>

#include "test_xdp_context_test_run.skel.h"

#include "test_xdp_meta.skel.h"



#define TX_ADDR "10.0.0.1"

#define RX_ADDR "10.0.0.2"

#define RX_NAME "veth0"

#define TX_NAME "veth1"

#define TX_NETNS "xdp_context_tx"

#define RX_NETNS "xdp_context_rx"



void test_xdp_context_error(int prog_fd, struct bpf_test_run_opts opts,

			    __u32 data_meta, __u32 data, __u32 data_end,
@@ -103,3 +111,82 @@ void test_xdp_context_test_run(void) 


	test_xdp_context_test_run__destroy(skel);

}



void test_xdp_context_functional(void)

{

	LIBBPF_OPTS(bpf_tc_hook, tc_hook, .attach_point = BPF_TC_INGRESS);

	LIBBPF_OPTS(bpf_tc_opts, tc_opts, .handle = 1, .priority = 1);

	struct netns_obj *rx_ns = NULL, *tx_ns = NULL;

	struct bpf_program *tc_prog, *xdp_prog;

	struct test_xdp_meta *skel = NULL;

	struct nstoken *nstoken = NULL;

	int rx_ifindex;

	int ret;



	tx_ns = netns_new(TX_NETNS, false);

	if (!ASSERT_OK_PTR(tx_ns, "create tx_ns"))

		return;



	rx_ns = netns_new(RX_NETNS, false);

	if (!ASSERT_OK_PTR(rx_ns, "create rx_ns"))

		goto close;



	SYS(close, "ip link add " RX_NAME " netns " RX_NETNS

	    " type veth peer name " TX_NAME " netns " TX_NETNS);



	nstoken = open_netns(RX_NETNS);

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

		goto close;



	SYS(close, "ip addr add " RX_ADDR "/24 dev " RX_NAME);

	SYS(close, "ip link set dev " RX_NAME " up");



	skel = test_xdp_meta__open_and_load();

	if (!ASSERT_OK_PTR(skel, "open and load skeleton"))

		goto close;



	rx_ifindex = if_nametoindex(RX_NAME);

	if (!ASSERT_GE(rx_ifindex, 0, "if_nametoindex rx"))

		goto close;



	tc_hook.ifindex = rx_ifindex;

	ret = bpf_tc_hook_create(&tc_hook);

	if (!ASSERT_OK(ret, "bpf_tc_hook_create"))

		goto close;



	tc_prog = bpf_object__find_program_by_name(skel->obj, "ing_cls");

	if (!ASSERT_OK_PTR(tc_prog, "open ing_cls prog"))

		goto close;



	tc_opts.prog_fd = bpf_program__fd(tc_prog);

	ret = bpf_tc_attach(&tc_hook, &tc_opts);

	if (!ASSERT_OK(ret, "bpf_tc_attach"))

		goto close;



	xdp_prog = bpf_object__find_program_by_name(skel->obj, "ing_xdp");

	if (!ASSERT_OK_PTR(xdp_prog, "open ing_xdp prog"))

		goto close;



	ret = bpf_xdp_attach(rx_ifindex,

			     bpf_program__fd(xdp_prog),

			     0, NULL);

	if (!ASSERT_GE(ret, 0, "bpf_xdp_attach"))

		goto close;



	close_netns(nstoken);



	nstoken = open_netns(TX_NETNS);

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

		goto close;



	SYS(close, "ip addr add " TX_ADDR "/24 dev " TX_NAME);

	SYS(close, "ip link set dev " TX_NAME " up");

	ASSERT_OK(SYS_NOFAIL("ping -c 1 " RX_ADDR), "ping");



close:

	close_netns(nstoken);

	test_xdp_meta__destroy(skel);

	netns_free(rx_ns);

	netns_free(tx_ns);

}

tools/testing/selftests/bpf/progs/test_xdp_meta.c

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1)

#define ctx_ptr(ctx, mem) (void *)(unsigned long)ctx->mem



SEC("t")

SEC("tc")

int ing_cls(struct __sk_buff *ctx)

{

	__u8 *data, *data_meta, *data_end;
@@ -28,7 +28,7 @@ int ing_cls(struct __sk_buff *ctx) 
	return diff ? TC_ACT_SHOT : TC_ACT_OK;

}



SEC("x")

SEC("xdp")

int ing_xdp(struct xdp_md *ctx)

{

	__u8 *data, *data_meta, *data_end;

tools/testing/selftests/bpf/test_xdp_meta.sh

deleted100755 → 0
+0 −58
Original line number Diff line number Diff line 
#!/bin/sh



BPF_FILE="test_xdp_meta.bpf.o"

# Kselftest framework requirement - SKIP code is 4.

readonly KSFT_SKIP=4

readonly NS1="ns1-$(mktemp -u XXXXXX)"

readonly NS2="ns2-$(mktemp -u XXXXXX)"



cleanup()

{

	if [ "$?" = "0" ]; then

		echo "selftests: test_xdp_meta [PASS]";

	else

		echo "selftests: test_xdp_meta [FAILED]";

	fi



	set +e

	ip link del veth1 2> /dev/null

	ip netns del ${NS1} 2> /dev/null

	ip netns del ${NS2} 2> /dev/null

}



ip link set dev lo xdp off 2>/dev/null > /dev/null

if [ $? -ne 0 ];then

	echo "selftests: [SKIP] Could not run test without the ip xdp support"

	exit $KSFT_SKIP

fi

set -e



ip netns add ${NS1}

ip netns add ${NS2}



trap cleanup 0 2 3 6 9



ip link add veth1 type veth peer name veth2



ip link set veth1 netns ${NS1}

ip link set veth2 netns ${NS2}



ip netns exec ${NS1} ip addr add 10.1.1.11/24 dev veth1

ip netns exec ${NS2} ip addr add 10.1.1.22/24 dev veth2



ip netns exec ${NS1} tc qdisc add dev veth1 clsact

ip netns exec ${NS2} tc qdisc add dev veth2 clsact



ip netns exec ${NS1} tc filter add dev veth1 ingress bpf da obj ${BPF_FILE} sec t

ip netns exec ${NS2} tc filter add dev veth2 ingress bpf da obj ${BPF_FILE} sec t



ip netns exec ${NS1} ip link set dev veth1 xdp obj ${BPF_FILE} sec x

ip netns exec ${NS2} ip link set dev veth2 xdp obj ${BPF_FILE} sec x



ip netns exec ${NS1} ip link set dev veth1 up

ip netns exec ${NS2} ip link set dev veth2 up



ip netns exec ${NS1} ping -c 1 10.1.1.22

ip netns exec ${NS2} ping -c 1 10.1.1.11



exit 0