Commit ccdf7fae authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Alexei Starovoitov says:

====================
pull-request: bpf-next 2020-10-12

The main changes are:

1) The BPF verifier improvements to track register allocation pattern, from Alexei and Yonghong.

2) libbpf relocation support for different size load/store, from Andrii.

3) bpf_redirect_peer() helper and support for inner map array with different max_entries, from Daniel.

4) BPF support for per-cpu variables, form Hao.

5) sockmap improvements, from John.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a308283f 376dcfe3

Documentation/bpf/bpf_devel_QA.rst

+2 −2
Original line number Diff line number Diff line
@@ -60,13 +60,13 @@ Q: Where can I find patches currently under discussion for BPF subsystem? 
A: All patches that are Cc'ed to netdev are queued for review under netdev

patchwork project:



  http://patchwork.ozlabs.org/project/netdev/list/

  https://patchwork.kernel.org/project/netdevbpf/list/



Those patches which target BPF, are assigned to a 'bpf' delegate for

further processing from BPF maintainers. The current queue with

patches under review can be found at:



  https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147

  https://patchwork.kernel.org/project/netdevbpf/list/?delegate=121173



Once the patches have been reviewed by the BPF community as a whole

and approved by the BPF maintainers, their status in patchwork will be

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3263,7 +3263,7 @@ M: Daniel Borkmann <daniel@iogearbox.net> 
R:	Martin KaFai Lau <kafai@fb.com>

R:	Song Liu <songliubraving@fb.com>

R:	Yonghong Song <yhs@fb.com>

R:	Andrii Nakryiko <andriin@fb.com>

R:	Andrii Nakryiko <andrii@kernel.org>

R:	John Fastabend <john.fastabend@gmail.com>

R:	KP Singh <kpsingh@chromium.org>

L:	netdev@vger.kernel.org

drivers/net/veth.c

+9 −0
Original line number Diff line number Diff line
@@ -420,6 +420,14 @@ static int veth_select_rxq(struct net_device *dev) 
	return smp_processor_id() % dev->real_num_rx_queues;

}



static struct net_device *veth_peer_dev(struct net_device *dev)

{

	struct veth_priv *priv = netdev_priv(dev);



	/* Callers must be under RCU read side. */

	return rcu_dereference(priv->peer);

}



static int veth_xdp_xmit(struct net_device *dev, int n,

			 struct xdp_frame **frames,

			 u32 flags, bool ndo_xmit)
@@ -1224,6 +1232,7 @@ static const struct net_device_ops veth_netdev_ops = { 
	.ndo_set_rx_headroom	= veth_set_rx_headroom,

	.ndo_bpf		= veth_xdp,

	.ndo_xdp_xmit		= veth_ndo_xdp_xmit,

	.ndo_get_peer_dev	= veth_peer_dev,

};



#define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HW_CSUM | \

include/linux/bpf.h

+7 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct bpf_map_ops { 
	void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file,

				int fd);

	void (*map_fd_put_ptr)(void *ptr);

	u32 (*map_gen_lookup)(struct bpf_map *map, struct bpf_insn *insn_buf);

	int (*map_gen_lookup)(struct bpf_map *map, struct bpf_insn *insn_buf);

	u32 (*map_fd_sys_lookup_elem)(void *ptr);

	void (*map_seq_show_elem)(struct bpf_map *map, void *key,

				  struct seq_file *m);
@@ -293,6 +293,7 @@ enum bpf_arg_type { 
	ARG_PTR_TO_ALLOC_MEM_OR_NULL,	/* pointer to dynamically allocated memory or NULL */

	ARG_CONST_ALLOC_SIZE_OR_ZERO,	/* number of allocated bytes requested */

	ARG_PTR_TO_BTF_ID_SOCK_COMMON,	/* pointer to in-kernel sock_common or bpf-mirrored bpf_sock */

	ARG_PTR_TO_PERCPU_BTF_ID,	/* pointer to in-kernel percpu type */

	__BPF_ARG_TYPE_MAX,

};
@@ -307,6 +308,8 @@ enum bpf_return_type { 
	RET_PTR_TO_SOCK_COMMON_OR_NULL,	/* returns a pointer to a sock_common or NULL */

	RET_PTR_TO_ALLOC_MEM_OR_NULL,	/* returns a pointer to dynamically allocated memory or NULL */

	RET_PTR_TO_BTF_ID_OR_NULL,	/* returns a pointer to a btf_id or NULL */

	RET_PTR_TO_MEM_OR_BTF_ID_OR_NULL, /* returns a pointer to a valid memory or a btf_id or NULL */

	RET_PTR_TO_MEM_OR_BTF_ID,	/* returns a pointer to a valid memory or a btf_id */

};



/* eBPF function prototype used by verifier to allow BPF_CALLs from eBPF programs
@@ -405,6 +408,7 @@ enum bpf_reg_type { 
	PTR_TO_RDONLY_BUF_OR_NULL, /* reg points to a readonly buffer or NULL */

	PTR_TO_RDWR_BUF,	 /* reg points to a read/write buffer */

	PTR_TO_RDWR_BUF_OR_NULL, /* reg points to a read/write buffer or NULL */

	PTR_TO_PERCPU_BTF_ID,	 /* reg points to a percpu kernel variable */

};



/* The information passed from prog-specific *_is_valid_access
@@ -1828,6 +1832,8 @@ extern const struct bpf_func_proto bpf_skc_to_tcp_request_sock_proto; 
extern const struct bpf_func_proto bpf_skc_to_udp6_sock_proto;

extern const struct bpf_func_proto bpf_copy_from_user_proto;

extern const struct bpf_func_proto bpf_snprintf_btf_proto;

extern const struct bpf_func_proto bpf_per_cpu_ptr_proto;

extern const struct bpf_func_proto bpf_this_cpu_ptr_proto;



const struct bpf_func_proto *bpf_tracing_func_proto(

	enum bpf_func_id func_id, const struct bpf_prog *prog);

include/linux/bpf_verifier.h

+7 −0
Original line number Diff line number Diff line
@@ -308,6 +308,13 @@ struct bpf_insn_aux_data { 
			u32 map_index;		/* index into used_maps[] */

			u32 map_off;		/* offset from value base address */

		};

		struct {

			enum bpf_reg_type reg_type;	/* type of pseudo_btf_id */

			union {

				u32 btf_id;	/* btf_id for struct typed var */

				u32 mem_size;	/* mem_size for non-struct typed var */

			};

		} btf_var;

	};

	u64 map_key_state; /* constant (32 bit) key tracking for maps */

	int ctx_field_size; /* the ctx field size for load insn, maybe 0 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE