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

Merge branch 'selftests/bpf: add coverage for xdp_features in test_progs' 

Alexis Lothoré says:

====================
this small series aims to increase coverage of xdp features in
test_progs. The initial versions proposed to rework test_xdp_features.sh
to make it fit in test_progs, but some discussions in v1 and v2 showed
that the script is still needed as a standalone tool. So this new
revision lets test_xdp_features.sh as-is, and rather adds missing
coverage in existing test (cpu map). The new revision is now also a
follow-up to the update performed by Florian Kauer in [1] for devmap
programs testing.

[1] https://lore.kernel.org/bpf/20240911-devel-koalo-fix-ingress-ifindex-v4-2-5c643ae10258@linutronix.de/
---
Changes in v3:
- Drop xdp_features rework commit
- update xdp_cpumap_attach to extend its coverage
- Link to v2: https://lore.kernel.org/r/20240910-convert_xdp_tests-v2-1-a46367c9d038@bootlin.com



Changes in v2:
- fix endianness management in userspace packet parsing (call htonl on
  constant rather than packet part)

The new test has been run in a local x86 environment and in CI:
 #560/1   xdp_cpumap_attach/CPUMAP with programs in entries:OK
 #560/2   xdp_cpumap_attach/CPUMAP with frags programs in entries:OK
 #560     xdp_cpumap_attach:OK
 Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
====================

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents 693fe954 d124d984

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

+36 −8
Original line number Diff line number Diff line
@@ -2,35 +2,41 @@ 
#include <uapi/linux/bpf.h>

#include <linux/if_link.h>

#include <test_progs.h>

#include <network_helpers.h>



#include "test_xdp_with_cpumap_frags_helpers.skel.h"

#include "test_xdp_with_cpumap_helpers.skel.h"



#define IFINDEX_LO	1

#define TEST_NS "cpu_attach_ns"



static void test_xdp_with_cpumap_helpers(void)

{

	struct test_xdp_with_cpumap_helpers *skel;

	struct test_xdp_with_cpumap_helpers *skel = NULL;

	struct bpf_prog_info info = {};

	__u32 len = sizeof(info);

	struct bpf_cpumap_val val = {

		.qsize = 192,

	};

	int err, prog_fd, map_fd;

	int err, prog_fd, prog_redir_fd, map_fd;

	struct nstoken *nstoken = NULL;

	__u32 idx = 0;



	SYS(out_close, "ip netns add %s", TEST_NS);

	nstoken = open_netns(TEST_NS);

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

		goto out_close;

	SYS(out_close, "ip link set dev lo up");



	skel = test_xdp_with_cpumap_helpers__open_and_load();

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

		return;



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

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE, NULL);

	prog_redir_fd = bpf_program__fd(skel->progs.xdp_redir_prog);

	err = bpf_xdp_attach(IFINDEX_LO, prog_redir_fd, XDP_FLAGS_SKB_MODE, NULL);

	if (!ASSERT_OK(err, "Generic attach of program with 8-byte CPUMAP"))

		goto out_close;



	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

	ASSERT_OK(err, "XDP program detach");



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

	map_fd = bpf_map__fd(skel->maps.cpu_map);

	err = bpf_prog_get_info_by_fd(prog_fd, &info, &len);
@@ -45,6 +51,26 @@ static void test_xdp_with_cpumap_helpers(void) 
	ASSERT_OK(err, "Read cpumap entry");

	ASSERT_EQ(info.id, val.bpf_prog.id, "Match program id to cpumap entry prog_id");



	/* send a packet to trigger any potential bugs in there */

	char data[10] = {};

	DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,

			    .data_in = &data,

			    .data_size_in = 10,

			    .flags = BPF_F_TEST_XDP_LIVE_FRAMES,

			    .repeat = 1,

		);

	err = bpf_prog_test_run_opts(prog_redir_fd, &opts);

	ASSERT_OK(err, "XDP test run");



	/* wait for the packets to be flushed, then check that redirect has been

	 * performed

	 */

	kern_sync_rcu();

	ASSERT_NEQ(skel->bss->redirect_count, 0, "redirected packets");



	err = bpf_xdp_detach(IFINDEX_LO, XDP_FLAGS_SKB_MODE, NULL);

	ASSERT_OK(err, "XDP program detach");



	/* can not attach BPF_XDP_CPUMAP program to a device */

	err = bpf_xdp_attach(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE, NULL);

	if (!ASSERT_NEQ(err, 0, "Attach of BPF_XDP_CPUMAP program"))
@@ -65,6 +91,8 @@ static void test_xdp_with_cpumap_helpers(void) 
	ASSERT_NEQ(err, 0, "Add BPF_XDP program with frags to cpumap entry");



out_close:

	close_netns(nstoken);

	SYS_NOFAIL("ip netns del %s", TEST_NS);

	test_xdp_with_cpumap_helpers__destroy(skel);

}
@@ -111,7 +139,7 @@ static void test_xdp_with_cpumap_frags_helpers(void) 
	test_xdp_with_cpumap_frags_helpers__destroy(skel);

}



void serial_test_xdp_cpumap_attach(void)

void test_xdp_cpumap_attach(void)

{

	if (test__start_subtest("CPUMAP with programs in entries"))

		test_xdp_with_cpumap_helpers();

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

+6 −1
Original line number Diff line number Diff line
@@ -12,10 +12,12 @@ struct { 
	__uint(max_entries, 4);

} cpu_map SEC(".maps");



__u32 redirect_count = 0;



SEC("xdp")

int xdp_redir_prog(struct xdp_md *ctx)

{

	return bpf_redirect_map(&cpu_map, 1, 0);

	return bpf_redirect_map(&cpu_map, 0, 0);

}



SEC("xdp")
@@ -27,6 +29,9 @@ int xdp_dummy_prog(struct xdp_md *ctx) 
SEC("xdp/cpumap")

int xdp_dummy_cm(struct xdp_md *ctx)

{

	if (bpf_get_smp_processor_id() == 0)

		redirect_count++;



	if (ctx->ingress_ifindex == IFINDEX_LO)

		return XDP_DROP;