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

Daniel Borkmann says: ==================== pull-request: bpf 2020-06-30 The following pull-request contains BPF updates for your *net* tree. We've added 28 non-merge commits during the last 9 day(s) which contain a total of 35 files changed, 486 insertions(+), 232 deletions(-). The main changes are: 1) Fix an incorrect verifier branch elimination for PTR_TO_BTF_ID pointer types, from Yonghong Song. 2) Fix UAPI for sockmap and flow_dissector progs that were ignoring various arguments passed to BPF_PROG_{ATTACH,DETACH}, from Lorenz Bauer & Jakub Sitnicki. 3) Fix broken AF_XDP DMA hacks that are poking into dma-direct and swiotlb internals and integrate it properly into DMA core, from Christoph Hellwig. 4) Fix RCU splat from recent changes to avoid skipping ingress policy when kTLS is enabled, from John Fastabend. 5) Fix BPF ringbuf map to enforce size to be the power of 2 in order for its position masking to work, from Andrii Nakryiko. 6) Fix regression from CAP_BPF work to re-allow CAP_SYS_ADMIN for loading of network programs, from Maciej Żenczykowski. 7) Fix libbpf section name prefix for devmap progs, from Jesper Dangaard Brouer. 8) Fix formatting in UAPI documentation for BPF helpers, from Quentin Monnet. ====================

David S. Miller committed 6 years ago

Commit e708e2b2 parents 0433c93 d92302135 files · +486 −232Browse files

Showing the changes to include/linux (6 of 35 files). Show all

Unified · Split

6 files

include/linux/bpf-netns.h +3 −2
include/linux/bpf.h +11 −2
include/linux/btf.h +5 −0
include/linux/dma-direct.h +1 −0
include/linux/dma-mapping.h +5 −0
include/linux/skmsg.h +13 −0

include/linux/bpf-netns.h+3−2

 			 union bpf_attr __user *uattr);
 int netns_bpf_prog_attach(const union bpf_attr *attr,
 			  struct bpf_prog *prog);
-int netns_bpf_prog_detach(const union bpf_attr *attr);
+int netns_bpf_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);
 int netns_bpf_link_create(const union bpf_attr *attr,
 			  struct bpf_prog *prog);
 #else
 	return -EOPNOTSUPP;
 }
-static inline int netns_bpf_prog_detach(const union bpf_attr *attr)
+static inline int netns_bpf_prog_detach(const union bpf_attr *attr,
+					enum bpf_prog_type ptype)
 {
 	return -EOPNOTSUPP;
 }

include/linux/bpf.h+11−2

 #endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */
 #if defined(CONFIG_BPF_STREAM_PARSER)
-int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog, u32 which);
+int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,
+			 struct bpf_prog *old, u32 which);
 int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog);
+int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);
 void sock_map_unhash(struct sock *sk);
 void sock_map_close(struct sock *sk, long timeout);
 #else
 static inline int sock_map_prog_update(struct bpf_map *map,
-				       struct bpf_prog *prog, u32 which)
+				       struct bpf_prog *prog,
+				       struct bpf_prog *old, u32 which)
 {
 	return -EOPNOTSUPP;
 }
 {
 	return -EINVAL;
 }
+static inline int sock_map_prog_detach(const union bpf_attr *attr,
+				       enum bpf_prog_type ptype)
+{
+	return -EOPNOTSUPP;
+}
 #endif /* CONFIG_BPF_STREAM_PARSER */
 #if defined(CONFIG_INET) && defined(CONFIG_BPF_SYSCALL)

include/linux/btf.h+5−0

 	return BTF_INFO_KIND(t->info) == BTF_KIND_INT;
 }
+static inline bool btf_type_is_small_int(const struct btf_type *t)
+{
+	return btf_type_is_int(t) && t->size <= sizeof(u64);
+}
 static inline bool btf_type_is_enum(const struct btf_type *t)
 {
 	return BTF_INFO_KIND(t->info) == BTF_KIND_ENUM;

include/linux/dma-direct.h+1−0

@@ -87,4 +87,5 @@ int dma_direct_mmap(struct device dev, struct vm_area_struct vma, · 86 unmodified lines
87	void *cpu_addr, dma_addr_t dma_addr, size_t size,	87	void *cpu_addr, dma_addr_t dma_addr, size_t size,
88	unsigned long attrs);	88	unsigned long attrs);
89	int dma_direct_supported(struct device *dev, u64 mask);	89	int dma_direct_supported(struct device *dev, u64 mask);
		90	bool dma_direct_need_sync(struct device *dev, dma_addr_t dma_addr);
90	#endif /* _LINUX_DMA_DIRECT_H */	91	#endif /* _LINUX_DMA_DIRECT_H */

include/linux/dma-mapping.h+5−0

 int dma_set_coherent_mask(struct device *dev, u64 mask);
 u64 dma_get_required_mask(struct device *dev);
 size_t dma_max_mapping_size(struct device *dev);
+bool dma_need_sync(struct device *dev, dma_addr_t dma_addr);
 unsigned long dma_get_merge_boundary(struct device *dev);
 #else /* CONFIG_HAS_DMA */
 static inline dma_addr_t dma_map_page_attrs(struct device *dev,
 {
 	return 0;
 }
+static inline bool dma_need_sync(struct device *dev, dma_addr_t dma_addr)
+{
+	return false;
+}
 static inline unsigned long dma_get_merge_boundary(struct device *dev)
 {
 	return 0;

include/linux/skmsg.h+13−0

@@ -430,6 +430,19 @@ static inline void psock_set_prog(struct bpf_prog **pprog, · 429 unmodified lines
430	bpf_prog_put(prog);	430	bpf_prog_put(prog);
431	}	431	}
432		432
		433	static inline int psock_replace_prog(struct bpf_prog **pprog,
		434	struct bpf_prog *prog,
		435	struct bpf_prog *old)
		436	{
		437	if (cmpxchg(pprog, old, prog) != old)
		438	return -ENOENT;
		439
		440	if (old)
		441	bpf_prog_put(old);
		442
		443	return 0;
		444	}
		445
433	static inline void psock_progs_drop(struct sk_psock_progs *progs)	446	static inline void psock_progs_drop(struct sk_psock_progs *progs)
434	{	447	{
435	psock_set_prog(&progs->msg_parser, NULL);	448	psock_set_prog(&progs->msg_parser, NULL);

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code