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

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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0433c93d d923021c

Documentation/core-api/dma-api.rst

+8 −0
Original line number Diff line number Diff line
@@ -204,6 +204,14 @@ Returns the maximum size of a mapping for the device. The size parameter 
of the mapping functions like dma_map_single(), dma_map_page() and

others should not be larger than the returned value.



::



	bool

	dma_need_sync(struct device *dev, dma_addr_t dma_addr);



Returns %true if dma_sync_single_for_{device,cpu} calls are required to

transfer memory ownership.  Returns %false if those calls can be skipped.



::



	unsigned long

include/linux/bpf-netns.h

+3 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int netns_bpf_prog_query(const union bpf_attr *attr, 
			 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
@@ -49,7 +49,8 @@ static inline int netns_bpf_prog_attach(const union bpf_attr *attr, 
	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
Original line number Diff line number Diff line
@@ -1543,13 +1543,16 @@ static inline void bpf_map_offload_map_free(struct bpf_map *map) 
#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;

}
@@ -1559,6 +1562,12 @@ static inline int sock_map_get_from_fd(const union bpf_attr *attr, 
{

	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
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ static inline bool btf_type_is_int(const struct btf_type *t) 
	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
Original line number Diff line number Diff line
@@ -87,4 +87,5 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma, 
		void *cpu_addr, dma_addr_t dma_addr, size_t size,

		unsigned long attrs);

int dma_direct_supported(struct device *dev, u64 mask);

bool dma_direct_need_sync(struct device *dev, dma_addr_t dma_addr);

#endif /* _LINUX_DMA_DIRECT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE