ebpf: include perf_event only where really needed (0cdf5640) · Commits · 戴 / test

Commit ("bpf: Add new bpf map type to store the pointer to struct perf_event") added perf_event.h to the main eBPF header, so it gets included for all users. perf_event.h is actually only needed from array map side, so lets sanitize this a bit. Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net> Cc: Kaixu Xia <xiakaixu@huawei.com> Acked-by:

Alexei Starovoitov <ast@plumgrid.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/linux/bpf.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@
	#include <uapi/linux/bpf.h>		#include <uapi/linux/bpf.h>
	#include <linux/workqueue.h>		#include <linux/workqueue.h>
	#include <linux/file.h>		#include <linux/file.h>
	#include <linux/perf_event.h>

	struct bpf_map;		struct bpf_map;

kernel/bpf/arraymap.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/mm.h>		#include <linux/mm.h>
	#include <linux/filter.h>		#include <linux/filter.h>
			#include <linux/perf_event.h>

	/* Called from syscall */		/* Called from syscall */
	static struct bpf_map array_map_alloc(union bpf_attr attr)		static struct bpf_map array_map_alloc(union bpf_attr attr)

Admin message