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

Merge branch 'ebpf_support_for_cls_bpf' 

Daniel Borkmann says:

====================
eBPF support for cls_bpf

This is the non-RFC version of my patchset posted before netdev01 [1]
conference. It contains a couple of eBPF cleanups and preparation
patches to get eBPF support into cls_bpf. The last patch adds the
actual support. I'll post the iproute2 parts after the kernel bits
are merged, an initial preview link to the code is mentioned in the
last patch.

Patch 4 and 5 were originally one patch, but I've split them into
two parts upon request as patch 4 only is also needed for Alexei's
tracing patches that go via tip tree.

Tested with tc and all in-kernel available BPF test suites.

I have configured and built LLVM with --enable-experimental-targets=BPF
but as Alexei put it, the plan is to get rid of the experimental
status in future [2].

Thanks a lot!

v1 -> v2:
 - Removed arch patches from this series
  - x86 is already queued in tip tree, under x86/mm
  - arm64 just reposted directly to arm folks
 - Rest is unchanged

  [1] http://thread.gmane.org/gmane.linux.network/350191
  [2] http://article.gmane.org/gmane.linux.kernel/1874969


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b656cc64 e2e9b654

include/linux/bpf.h

+24 −14
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ struct bpf_map { 
	u32 key_size;

	u32 value_size;

	u32 max_entries;

	struct bpf_map_ops *ops;

	const struct bpf_map_ops *ops;

	struct work_struct work;

};



struct bpf_map_type_list {

	struct list_head list_node;

	struct bpf_map_ops *ops;

	const struct bpf_map_ops *ops;

	enum bpf_map_type type;

};
@@ -109,37 +109,47 @@ struct bpf_verifier_ops { 


struct bpf_prog_type_list {

	struct list_head list_node;

	struct bpf_verifier_ops *ops;

	const struct bpf_verifier_ops *ops;

	enum bpf_prog_type type;

};



void bpf_register_prog_type(struct bpf_prog_type_list *tl);



struct bpf_prog;



struct bpf_prog_aux {

	atomic_t refcnt;

	bool is_gpl_compatible;

	enum bpf_prog_type prog_type;

	struct bpf_verifier_ops *ops;

	struct bpf_map **used_maps;

	u32 used_map_cnt;

	const struct bpf_verifier_ops *ops;

	struct bpf_map **used_maps;

	struct bpf_prog *prog;

	struct work_struct work;

};



#ifdef CONFIG_BPF_SYSCALL

void bpf_register_prog_type(struct bpf_prog_type_list *tl);



void bpf_prog_put(struct bpf_prog *prog);

struct bpf_prog *bpf_prog_get(u32 ufd);

#else

static inline void bpf_prog_put(struct bpf_prog *prog) {}

static inline void bpf_register_prog_type(struct bpf_prog_type_list *tl)

{

}



static inline struct bpf_prog *bpf_prog_get(u32 ufd)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline void bpf_prog_put(struct bpf_prog *prog)

{

}

#endif

struct bpf_prog *bpf_prog_get(u32 ufd);



/* verify correctness of eBPF program */

int bpf_check(struct bpf_prog *fp, union bpf_attr *attr);



/* verifier prototypes for helper functions called from eBPF programs */

extern struct bpf_func_proto bpf_map_lookup_elem_proto;

extern struct bpf_func_proto bpf_map_update_elem_proto;

extern struct bpf_func_proto bpf_map_delete_elem_proto;

extern const struct bpf_func_proto bpf_map_lookup_elem_proto;

extern const struct bpf_func_proto bpf_map_update_elem_proto;

extern const struct bpf_func_proto bpf_map_delete_elem_proto;



#endif /* _LINUX_BPF_H */

include/linux/filter.h

+3 −3
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ struct bpf_prog_aux; 
		.off   = 0,					\

		.imm   = ((__u64) (IMM)) >> 32 })



#define BPF_PSEUDO_MAP_FD	1



/* pseudo BPF_LD_IMM64 insn used to refer to process-local map_fd */

#define BPF_LD_MAP_FD(DST, MAP_FD)				\

	BPF_LD_IMM64_RAW(DST, BPF_PSEUDO_MAP_FD, MAP_FD)
@@ -310,9 +308,11 @@ struct bpf_binary_header { 
struct bpf_prog {

	u16			pages;		/* Number of allocated pages */

	bool			jited;		/* Is our filter JIT'ed? */

	bool			gpl_compatible;	/* Is our filter GPL compatible? */

	u32			len;		/* Number of filter blocks */

	struct sock_fprog_kern	*orig_prog;	/* Original BPF program */

	enum bpf_prog_type	type;		/* Type of BPF program */

	struct bpf_prog_aux	*aux;		/* Auxiliary fields */

	struct sock_fprog_kern	*orig_prog;	/* Original BPF program */

	unsigned int		(*bpf_func)(const struct sk_buff *skb,

					    const struct bpf_insn *filter);

	/* Instructions for interpreter */

include/uapi/linux/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -118,8 +118,11 @@ enum bpf_map_type { 
enum bpf_prog_type {

	BPF_PROG_TYPE_UNSPEC,

	BPF_PROG_TYPE_SOCKET_FILTER,

	BPF_PROG_TYPE_SCHED_CLS,

};



#define BPF_PSEUDO_MAP_FD	1



/* flags for BPF_MAP_UPDATE_ELEM command */

#define BPF_ANY		0 /* create new element or update existing */

#define BPF_NOEXIST	1 /* create new element if it didn't exist */

include/uapi/linux/pkt_cls.h

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ enum { 
	TCA_BPF_CLASSID,

	TCA_BPF_OPS_LEN,

	TCA_BPF_OPS,

	TCA_BPF_FD,

	TCA_BPF_NAME,

	__TCA_BPF_MAX,

};

kernel/bpf/Makefile

+0 −3
Original line number Diff line number Diff line 
obj-y := core.o

obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o hashtab.o arraymap.o helpers.o
 
ifdef CONFIG_TEST_BPF

obj-$(CONFIG_BPF_SYSCALL) += test_stub.o

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE