Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Daniel Borkmann says: ==================== pull-request: bpf-next 2019-10-27 The following pull-request contains BPF updates for your *net-next* tree. We've added 52 non-merge commits during the last 11 day(s) which contain a total of 65 files changed, 2604 insertions(+), 1100 deletions(-). The main changes are: 1) Revolutionize BPF tracing by using in-kernel BTF to type check BPF assembly code. The work here teaches BPF verifier to recognize kfree_skb()'s first argument as 'struct sk_buff *' in tracepoints such that verifier allows direct use of bpf_skb_event_output() helper used in tc BPF et al (w/o probing memory access) that dumps skb data into perf ring buffer. Also add direct loads to probe memory in order to speed up/replace bpf_probe_read() calls, from Alexei Starovoitov. 2) Big batch of changes to improve libbpf and BPF kselftests. Besides others: generalization of libbpf's CO-RE relocation support to now also include field existence relocations, revamp the BPF kselftest Makefile to add test runner concept allowing to exercise various ways to build BPF programs, and teach bpf_object__open() and friends to automatically derive BPF program type/expected attach type from section names to ease their use, from Andrii Nakryiko. 3) Fix deadlock in stackmap's build-id lookup on rq_lock(), from Song Liu. 4) Allow to read BTF as raw data from bpftool. Most notable use case is to dump /sys/kernel/btf/vmlinux through this, from Jiri Olsa. 5) Use bpf_redirect_map() helper in libbpf's AF_XDP helper prog which manages to improve "rx_drop" performance by ~4%., from Björn Töpel. 6) Fix to restore the flow dissector after reattach BPF test and also fix error handling in bpf_helper_defs.h generation, from Jakub Sitnicki. 7) Improve verifier's BTF ctx access for use outside of raw_tp, from Martin KaFai Lau. 8) Improve documentation for AF_XDP with new sections and to reflect latest features, from Magnus Karlsson. 9) Add back 'version' section parsing to libbpf for old kernels, from John Fastabend. 10) Fix strncat bounds error in libbpf's libbpf_prog_type_by_name(), from KP Singh. 11) Turn on -mattr=+alu32 in LLVM by default for BPF kselftests in order to improve insn coverage for built BPF progs, from Yonghong Song. 12) Misc minor cleanups and fixes, from various others. ====================

David S. Miller committed 7 years ago

Commit 5b7fe932 parents b951248 027cbaa65 files · +2604 −1100Browse files

Showing the changes to include/linux (5 of 65 files). Show all

Unified · Split

5 files

include/linux/bpf.h +38 −6
include/linux/bpf_verifier.h +7 −1
include/linux/btf.h +32 −0
include/linux/extable.h +10 −0
include/linux/filter.h +5 −1

include/linux/bpf.h+38−6

 #include <linux/u64_stats_sync.h>
 struct bpf_verifier_env;
+struct bpf_verifier_log;
 struct perf_event;
 struct bpf_prog;
 struct bpf_map;
 struct seq_file;
 struct btf;
 struct btf_type;
+struct exception_table_entry;
 extern struct idr btf_idr;
 extern spinlock_t btf_idr_lock;
 	ARG_PTR_TO_INT,		/* pointer to int */
 	ARG_PTR_TO_LONG,	/* pointer to long */
 	ARG_PTR_TO_SOCKET,	/* pointer to bpf_sock (fullsock) */
+	ARG_PTR_TO_BTF_ID,	/* pointer to in-kernel struct */
 };
 /* type of values returned from helper functions */
 	bool gpl_only;
 	bool pkt_access;
 	enum bpf_return_type ret_type;
-	enum bpf_arg_type arg1_type;
+	union {
-	enum bpf_arg_type arg2_type;
+		struct {
-	enum bpf_arg_type arg3_type;
+			enum bpf_arg_type arg1_type;
-	enum bpf_arg_type arg4_type;
+			enum bpf_arg_type arg2_type;
-	enum bpf_arg_type arg5_type;
+			enum bpf_arg_type arg3_type;
+			enum bpf_arg_type arg4_type;
+			enum bpf_arg_type arg5_type;
+		};
+		enum bpf_arg_type arg_type[5];
+	};
+	u32 *btf_id; /* BTF ids of arguments */
 };
 /* bpf_context is intentionally undefined structure. Pointer to bpf_context is
 	PTR_TO_TCP_SOCK_OR_NULL, /* reg points to struct tcp_sock or NULL */
 	PTR_TO_TP_BUFFER,	 /* reg points to a writable raw tp's buffer */
 	PTR_TO_XDP_SOCK,	 /* reg points to struct xdp_sock */
+	PTR_TO_BTF_ID,		 /* reg points to kernel struct */
 };
 /* The information passed from prog-specific *_is_valid_access
  */
 struct bpf_insn_access_aux {
 	enum bpf_reg_type reg_type;
-	int ctx_field_size;
+	union {
+		int ctx_field_size;
+		u32 btf_id;
+	};
+	struct bpf_verifier_log *log; /* for verbose logs */
 };
 static inline void
 	u32 id;
 	u32 func_cnt; /* used by non-func prog as the number of func progs */
 	u32 func_idx; /* 0 for non-func prog, the index in func array for func prog */
+	u32 attach_btf_id; /* in-kernel BTF type id to attach to */
 	bool verifier_zext; /* Zero extensions has been inserted by verifier. */
 	bool offload_requested;
+	bool attach_btf_trace; /* true if attaching to BTF-enabled raw tp */
+	/* BTF_KIND_FUNC_PROTO for valid attach_btf_id */
+	const struct btf_type *attach_func_proto;
+	/* function name for valid attach_btf_id */
+	const char *attach_func_name;
 	struct bpf_prog **func;
 	void *jit_data; /* JIT specific data. arch dependent */
 	struct latch_tree_node ksym_tnode;
 	 * main prog always has linfo_idx == 0
 	 */
 	u32 linfo_idx;
+	u32 num_exentries;
+	struct exception_table_entry *extable;
 	struct bpf_prog_stats __percpu *stats;
 	union {
 		struct work_struct work;
 bool bpf_prog_array_compatible(struct bpf_array *array, const struct bpf_prog *fp);
 int bpf_prog_calc_tag(struct bpf_prog *fp);
+const char *kernel_type_name(u32 btf_type_id);
 const struct bpf_func_proto *bpf_get_trace_printk_proto(void);
 int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,
 				     const union bpf_attr *kattr,
 				     union bpf_attr __user *uattr);
+bool btf_ctx_access(int off, int size, enum bpf_access_type type,
+		    const struct bpf_prog *prog,
+		    struct bpf_insn_access_aux *info);
+int btf_struct_access(struct bpf_verifier_log *log,
+		      const struct btf_type *t, int off, int size,
+		      enum bpf_access_type atype,
+		      u32 *next_btf_id);
+u32 btf_resolve_helper_id(struct bpf_verifier_log *log, void *, int);
 #else /* !CONFIG_BPF_SYSCALL */
 static inline struct bpf_prog *bpf_prog_get(u32 ufd)
 {

include/linux/bpf_verifier.h+7−1

 		 */
 		struct bpf_map *map_ptr;
+		u32 btf_id; /* for PTR_TO_BTF_ID */
 		/* Max size from any of the above. */
 		unsigned long raw;
 	};
 #define BPF_LOG_STATS	4
 #define BPF_LOG_LEVEL	(BPF_LOG_LEVEL1 | BPF_LOG_LEVEL2)
 #define BPF_LOG_MASK	(BPF_LOG_LEVEL | BPF_LOG_STATS)
+#define BPF_LOG_KERNEL	(BPF_LOG_MASK + 1) /* kernel internal flag */
 static inline bool bpf_verifier_log_needed(const struct bpf_verifier_log *log)
 {
-	return log->level && log->ubuf && !bpf_verifier_log_full(log);
+	return (log->level && log->ubuf && !bpf_verifier_log_full(log)) ||
+		log->level == BPF_LOG_KERNEL;
 }
 #define BPF_MAX_SUBPROGS 256
 				      const char *fmt, va_list args);
 __printf(2, 3) void bpf_verifier_log_write(struct bpf_verifier_env *env,
 					   const char *fmt, ...);
+__printf(2, 3) void bpf_log(struct bpf_verifier_log *log,
+			    const char *fmt, ...);
 static inline struct bpf_func_state *cur_func(struct bpf_verifier_env *env)
 {

include/linux/btf.h+32−0

@@ -5,6 +5,7 @@ · 4 unmodified lines
5	#define _LINUX_BTF_H 1	5	#define _LINUX_BTF_H 1
6		6
7	#include <linux/types.h>	7	#include <linux/types.h>
		8	#include <uapi/linux/btf.h>
8		9
9	struct btf;	10	struct btf;
10	struct btf_member;	11	struct btf_member;
@@ -53,9 +54,40 @@ bool btf_member_is_reg_int(const struct btf btf, const struct btf_type s, · 42 unmodified lines
53	int btf_find_spin_lock(const struct btf btf, const struct btf_type t);	54	int btf_find_spin_lock(const struct btf btf, const struct btf_type t);
54	bool btf_type_is_void(const struct btf_type *t);	55	bool btf_type_is_void(const struct btf_type *t);
55		56
		57	static inline bool btf_type_is_ptr(const struct btf_type *t)
		58	{
		59	return BTF_INFO_KIND(t->info) == BTF_KIND_PTR;
		60	}
		61
		62	static inline bool btf_type_is_int(const struct btf_type *t)
		63	{
		64	return BTF_INFO_KIND(t->info) == BTF_KIND_INT;
		65	}
		66
		67	static inline bool btf_type_is_enum(const struct btf_type *t)
		68	{
		69	return BTF_INFO_KIND(t->info) == BTF_KIND_ENUM;
		70	}
		71
		72	static inline bool btf_type_is_typedef(const struct btf_type *t)
		73	{
		74	return BTF_INFO_KIND(t->info) == BTF_KIND_TYPEDEF;
		75	}
		76
		77	static inline bool btf_type_is_func(const struct btf_type *t)
		78	{
		79	return BTF_INFO_KIND(t->info) == BTF_KIND_FUNC;
		80	}
		81
		82	static inline bool btf_type_is_func_proto(const struct btf_type *t)
		83	{
		84	return BTF_INFO_KIND(t->info) == BTF_KIND_FUNC_PROTO;
		85	}
		86
56	#ifdef CONFIG_BPF_SYSCALL	87	#ifdef CONFIG_BPF_SYSCALL
57	const struct btf_type btf_type_by_id(const struct btf btf, u32 type_id);	88	const struct btf_type btf_type_by_id(const struct btf btf, u32 type_id);
58	const char btf_name_by_offset(const struct btf btf, u32 offset);	89	const char btf_name_by_offset(const struct btf btf, u32 offset);
		90	struct btf *btf_parse_vmlinux(void);
59	#else	91	#else
60	static inline const struct btf_type btf_type_by_id(const struct btf btf,	92	static inline const struct btf_type btf_type_by_id(const struct btf btf,
61	u32 type_id)	93	u32 type_id)

include/linux/extable.h+10−0

@@ -33,4 +33,14 @@ search_module_extables(unsigned long addr) · 32 unmodified lines
33	}	33	}
34	#endif /CONFIG_MODULES/	34	#endif /CONFIG_MODULES/
35		35
		36	#ifdef CONFIG_BPF_JIT
		37	const struct exception_table_entry *search_bpf_extables(unsigned long addr);
		38	#else
		39	static inline const struct exception_table_entry *
		40	search_bpf_extables(unsigned long addr)
		41	{
		42	return NULL;
		43	}
		44	#endif
		45
36	#endif /* _LINUX_EXTABLE_H */	46	#endif /* _LINUX_EXTABLE_H */

include/linux/filter.h+5−1

 /* unused opcode to mark special call to bpf_tail_call() helper */
 #define BPF_TAIL_CALL	0xf0
+/* unused opcode to mark special load instruction. Same as BPF_ABS */
+#define BPF_PROBE_MEM	0x20
 /* unused opcode to mark call to interpreter with arguments */
 #define BPF_CALL_ARGS	0xe0
 #define BPF_CALL_x(x, name, ...)					       \
 	static __always_inline						       \
 	u64 ____##name(__BPF_MAP(x, __BPF_DECL_ARGS, __BPF_V, __VA_ARGS__));   \
+	typedef u64 (*btf_##name)(__BPF_MAP(x, __BPF_DECL_ARGS, __BPF_V, __VA_ARGS__)); \
 	u64 name(__BPF_REG(x, __BPF_DECL_REGS, __BPF_N, __VA_ARGS__));	       \
 	u64 name(__BPF_REG(x, __BPF_DECL_REGS, __BPF_N, __VA_ARGS__))	       \
 	{								       \
-		return ____##name(__BPF_MAP(x,__BPF_CAST,__BPF_N,__VA_ARGS__));\
+		return ((btf_##name)____##name)(__BPF_MAP(x,__BPF_CAST,__BPF_N,__VA_ARGS__));\
 	}								       \
 	static __always_inline						       \
 	u64 ____##name(__BPF_MAP(x, __BPF_DECL_ARGS, __BPF_V, __VA_ARGS__))

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code