Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eefe06e8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-prog-testing-framework' 



Alexei Starovoitov says:

====================
bpf: program testing framework

Development and testing of networking bpf programs is quite cumbersome.
Especially tricky are XDP programs that attach to real netdevices and
program development feels like working on the car engine while
the car is in motion.
Another problem is ongoing changes to upstream llvm core
that can introduce an optimization that verifier will not
recognize. llvm bpf backend tests have no ability to run the programs.
To improve this situation introduce BPF_PROG_TEST_RUN command
to test and performance benchmark bpf programs.
It achieves several goals:
- development of xdp and skb based bpf programs can be done
in a canned environment with unit tests
- program performance optimizations can be benchmarked outside of
networking core (without driver and skb costs)
- continuous testing of upstream changes is finally practical

Patches 4,5,6 add C based test cases of various complexity
to cover some sched_cls and xdp features. More tests will
be added in the future. The tests were run on centos7 only.

For now the framework supports only skb and xdp programs. In the future
it can be extended to socket_filter and tracing program types.

More details are in individual patches.

v1->v2:
- rename bpf_program_test_run->bpf_prog_test_run
- add missing #include <linux/bpf.h> since libbpf.h shouldn't depend
on prior includes
- reordered patches 3 and 4 to keep bisect clean
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 98cd1552 37821613

include/linux/bpf.h

+7 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ struct bpf_verifier_ops { 
				  const struct bpf_insn *src,

				  struct bpf_insn *dst,

				  struct bpf_prog *prog);

	int (*test_run)(struct bpf_prog *prog, const union bpf_attr *kattr,

			union bpf_attr __user *uattr);

};



struct bpf_prog_type_list {
@@ -233,6 +235,11 @@ typedef unsigned long (*bpf_ctx_copy_t)(void *dst, const void *src, 
u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,

		     void *ctx, u64 ctx_size, bpf_ctx_copy_t ctx_copy);



int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,

			  union bpf_attr __user *uattr);

int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,

			  union bpf_attr __user *uattr);



#ifdef CONFIG_BPF_SYSCALL

DECLARE_PER_CPU(int, bpf_prog_active);

include/uapi/linux/bpf.h

+12 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ enum bpf_cmd { 
	BPF_OBJ_GET,

	BPF_PROG_ATTACH,

	BPF_PROG_DETACH,

	BPF_PROG_TEST_RUN,

};



enum bpf_map_type {
@@ -189,6 +190,17 @@ union bpf_attr { 
		__u32		attach_type;

		__u32		attach_flags;

	};



	struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */

		__u32		prog_fd;

		__u32		retval;

		__u32		data_size_in;

		__u32		data_size_out;

		__aligned_u64	data_in;

		__aligned_u64	data_out;

		__u32		repeat;

		__u32		duration;

	} test;

} __attribute__((aligned(8)));



/* BPF helper function descriptions:

kernel/bpf/syscall.c

+25 −2
Original line number Diff line number Diff line
@@ -973,6 +973,28 @@ static int bpf_prog_detach(const union bpf_attr *attr) 
}

#endif /* CONFIG_CGROUP_BPF */



#define BPF_PROG_TEST_RUN_LAST_FIELD test.duration



static int bpf_prog_test_run(const union bpf_attr *attr,

			     union bpf_attr __user *uattr)

{

	struct bpf_prog *prog;

	int ret = -ENOTSUPP;



	if (CHECK_ATTR(BPF_PROG_TEST_RUN))

		return -EINVAL;



	prog = bpf_prog_get(attr->test.prog_fd);

	if (IS_ERR(prog))

		return PTR_ERR(prog);



	if (prog->aux->ops->test_run)

		ret = prog->aux->ops->test_run(prog, attr, uattr);



	bpf_prog_put(prog);

	return ret;

}



SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)

{

	union bpf_attr attr = {};
@@ -1039,7 +1061,6 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz 
	case BPF_OBJ_GET:

		err = bpf_obj_get(&attr);

		break;



#ifdef CONFIG_CGROUP_BPF

	case BPF_PROG_ATTACH:

		err = bpf_prog_attach(&attr);
@@ -1048,7 +1069,9 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz 
		err = bpf_prog_detach(&attr);

		break;

#endif



	case BPF_PROG_TEST_RUN:

		err = bpf_prog_test_run(&attr, uattr);

		break;

	default:

		err = -EINVAL;

		break;

net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ obj-$(CONFIG_NET) += $(tmp-y) 


# LLC has to be linked before the files in net/802/

obj-$(CONFIG_LLC)		+= llc/

obj-$(CONFIG_NET)		+= ethernet/ 802/ sched/ netlink/

obj-$(CONFIG_NET)		+= ethernet/ 802/ sched/ netlink/ bpf/

obj-$(CONFIG_NETFILTER)		+= netfilter/

obj-$(CONFIG_INET)		+= ipv4/

obj-$(CONFIG_XFRM)		+= xfrm/

net/bpf/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y	:= test_run.o