Commit 0c5e118c authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Alexei Starovoitov
Browse files

bpf: selftests: add CPUMAP/DEVMAP selftests for xdp frags 



Verify compatibility checks attaching a XDP frags program to a
CPUMAP/DEVMAP

Acked-by: default avatarToke Hoiland-Jorgensen <toke@redhat.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/d94b4d35adc1e42c9ca5004e6b2cdfd75992304d.1642758637.git.lorenzo@kernel.org


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

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

+63 −1
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ 
#include <linux/if_link.h>

#include <test_progs.h>



#include "test_xdp_with_cpumap_frags_helpers.skel.h"

#include "test_xdp_with_cpumap_helpers.skel.h"



#define IFINDEX_LO	1



void serial_test_xdp_cpumap_attach(void)

void test_xdp_with_cpumap_helpers(void)

{

	struct test_xdp_with_cpumap_helpers *skel;

	struct bpf_prog_info info = {};
@@ -54,6 +55,67 @@ void serial_test_xdp_cpumap_attach(void) 
	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add non-BPF_XDP_CPUMAP program to cpumap entry");



	/* Try to attach BPF_XDP program with frags to cpumap when we have

	 * already loaded a BPF_XDP program on the map

	 */

	idx = 1;

	val.qsize = 192;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_cm_frags);

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add BPF_XDP program with frags to cpumap entry");



out_close:

	test_xdp_with_cpumap_helpers__destroy(skel);

}



void test_xdp_with_cpumap_frags_helpers(void)

{

	struct test_xdp_with_cpumap_frags_helpers *skel;

	struct bpf_prog_info info = {};

	__u32 len = sizeof(info);

	struct bpf_cpumap_val val = {

		.qsize = 192,

	};

	int err, frags_prog_fd, map_fd;

	__u32 idx = 0;



	skel = test_xdp_with_cpumap_frags_helpers__open_and_load();

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

		return;



	frags_prog_fd = bpf_program__fd(skel->progs.xdp_dummy_cm_frags);

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

	err = bpf_obj_get_info_by_fd(frags_prog_fd, &info, &len);

	if (!ASSERT_OK(err, "bpf_obj_get_info_by_fd"))

		goto out_close;



	val.bpf_prog.fd = frags_prog_fd;

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_OK(err, "Add program to cpumap entry");



	err = bpf_map_lookup_elem(map_fd, &idx, &val);

	ASSERT_OK(err, "Read cpumap entry");

	ASSERT_EQ(info.id, val.bpf_prog.id,

		  "Match program id to cpumap entry prog_id");



	/* Try to attach BPF_XDP program to cpumap when we have

	 * already loaded a BPF_XDP program with frags on the map

	 */

	idx = 1;

	val.qsize = 192;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_cm);

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add BPF_XDP program to cpumap entry");



out_close:

	test_xdp_with_cpumap_frags_helpers__destroy(skel);

}



void serial_test_xdp_cpumap_attach(void)

{

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

		test_xdp_with_cpumap_helpers();



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

		test_xdp_with_cpumap_frags_helpers();

}

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

+55 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <test_progs.h>



#include "test_xdp_devmap_helpers.skel.h"

#include "test_xdp_with_devmap_frags_helpers.skel.h"

#include "test_xdp_with_devmap_helpers.skel.h"



#define IFINDEX_LO 1
@@ -56,6 +57,15 @@ static void test_xdp_with_devmap_helpers(void) 
	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add non-BPF_XDP_DEVMAP program to devmap entry");



	/* Try to attach BPF_XDP program with frags to devmap when we have

	 * already loaded a BPF_XDP program on the map

	 */

	idx = 1;

	val.ifindex = 1;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_dm_frags);

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add BPF_XDP program with frags to devmap entry");



out_close:

	test_xdp_with_devmap_helpers__destroy(skel);

}
@@ -71,12 +81,57 @@ static void test_neg_xdp_devmap_helpers(void) 
	}

}



void test_xdp_with_devmap_frags_helpers(void)

{

	struct test_xdp_with_devmap_frags_helpers *skel;

	struct bpf_prog_info info = {};

	struct bpf_devmap_val val = {

		.ifindex = IFINDEX_LO,

	};

	__u32 len = sizeof(info);

	int err, dm_fd_frags, map_fd;

	__u32 idx = 0;



	skel = test_xdp_with_devmap_frags_helpers__open_and_load();

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

		return;



	dm_fd_frags = bpf_program__fd(skel->progs.xdp_dummy_dm_frags);

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

	err = bpf_obj_get_info_by_fd(dm_fd_frags, &info, &len);

	if (!ASSERT_OK(err, "bpf_obj_get_info_by_fd"))

		goto out_close;



	val.bpf_prog.fd = dm_fd_frags;

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_OK(err, "Add frags program to devmap entry");



	err = bpf_map_lookup_elem(map_fd, &idx, &val);

	ASSERT_OK(err, "Read devmap entry");

	ASSERT_EQ(info.id, val.bpf_prog.id,

		  "Match program id to devmap entry prog_id");



	/* Try to attach BPF_XDP program to devmap when we have

	 * already loaded a BPF_XDP program with frags on the map

	 */

	idx = 1;

	val.ifindex = 1;

	val.bpf_prog.fd = bpf_program__fd(skel->progs.xdp_dummy_dm);

	err = bpf_map_update_elem(map_fd, &idx, &val, 0);

	ASSERT_NEQ(err, 0, "Add BPF_XDP program to devmap entry");



out_close:

	test_xdp_with_devmap_frags_helpers__destroy(skel);

}



void serial_test_xdp_devmap_attach(void)

{

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

		test_xdp_with_devmap_helpers();



	if (test__start_subtest("DEVMAP with frags programs in entries"))

		test_xdp_with_devmap_frags_helpers();



	if (test__start_subtest("Verifier check of DEVMAP programs"))

		test_neg_xdp_devmap_helpers();

}

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



#define IFINDEX_LO	1



struct {

	__uint(type, BPF_MAP_TYPE_CPUMAP);

	__uint(key_size, sizeof(__u32));

	__uint(value_size, sizeof(struct bpf_cpumap_val));

	__uint(max_entries, 4);

} cpu_map SEC(".maps");



SEC("xdp_cpumap/dummy_cm")

int xdp_dummy_cm(struct xdp_md *ctx)

{

	return XDP_PASS;

}



SEC("xdp.frags/cpumap")

int xdp_dummy_cm_frags(struct xdp_md *ctx)

{

	return XDP_PASS;

}



char _license[] SEC("license") = "GPL";

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

+6 −0
Original line number Diff line number Diff line
@@ -33,4 +33,10 @@ int xdp_dummy_cm(struct xdp_md *ctx) 
	return XDP_PASS;

}



SEC("xdp.frags/cpumap")

int xdp_dummy_cm_frags(struct xdp_md *ctx)

{

	return XDP_PASS;

}



char _license[] SEC("license") = "GPL";

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/bpf.h>

#include <bpf/bpf_helpers.h>



struct {

	__uint(type, BPF_MAP_TYPE_DEVMAP);

	__uint(key_size, sizeof(__u32));

	__uint(value_size, sizeof(struct bpf_devmap_val));

	__uint(max_entries, 4);

} dm_ports SEC(".maps");



/* valid program on DEVMAP entry via SEC name;

 * has access to egress and ingress ifindex

 */

SEC("xdp_devmap/map_prog")

int xdp_dummy_dm(struct xdp_md *ctx)

{

	return XDP_PASS;

}



SEC("xdp.frags/devmap")

int xdp_dummy_dm_frags(struct xdp_md *ctx)

{

	return XDP_PASS;

}



char _license[] SEC("license") = "GPL";