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

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

Alexei Starovoitov says:

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

The following pull-request contains BPF updates for your *net* tree.

We've added 21 non-merge commits during the last 12 day(s) which contain
a total of 21 files changed, 163 insertions(+), 88 deletions(-).

The main changes are:

1) Fix propagation of 32-bit signed bounds from 64-bit bounds, from Alexei.

2) Fix ring_buffer__poll() return value, from Andrii.

3) Fix race in lwt_bpf, from Cong.

4) Fix test_offload, from Toke.

5) Various xsk fixes.

Please consider pulling these changes from:

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



Thanks a lot!

Also thanks to reporters, reviewers and testers of commits in this pull-request:

Cong Wang, Hulk Robot, Jakub Kicinski, Jean-Philippe Brucker, John
Fastabend, Magnus Karlsson, Maxim Mikityanskiy, Yonghong Song
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 38bf8cd8 3615bdf6

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3239,7 +3239,7 @@ R: Martin KaFai Lau <kafai@fb.com> 
R:	Song Liu <songliubraving@fb.com>

R:	Yonghong Song <yhs@fb.com>

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

R:	KP Singh <kpsingh@chromium.org>

R:	KP Singh <kpsingh@kernel.org>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

S:	Supported
@@ -3358,7 +3358,7 @@ F: arch/x86/net/ 
X:	arch/x86/net/bpf_jit_comp32.c









BPF LSM (Security Audit and Enforcement using BPF)









M:	KP Singh <kpsingh@chromium.org>









M:	KP Singh <kpsingh@kernel.org>









R:	Florent Revest <revest@chromium.org>









R:	Brendan Jackman <jackmanb@chromium.org>









L:	bpf@vger.kernel.org
































drivers/net/ethernet/netronome/nfp/nfp_net_common.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -3562,9 +3562,6 @@ static int nfp_net_xdp_setup_drv(struct nfp_net *nn, struct netdev_bpf *bpf)







	struct nfp_net_dp *dp;









	int err;



















	if (!xdp_attachment_flags_ok(&nn->xdp, bpf))









		return -EBUSY;



















	if (!prog == !nn->dp.xdp_prog) {









		WRITE_ONCE(nn->dp.xdp_prog, prog);









		xdp_attachment_setup(&nn->xdp, bpf);








@@ -3593,9 +3590,6 @@ static int nfp_net_xdp_setup_hw(struct nfp_net *nn, struct netdev_bpf *bpf)







{









	int err;



















	if (!xdp_attachment_flags_ok(&nn->xdp_hw, bpf))









		return -EBUSY;



















	err = nfp_app_xdp_offload(nn->app, nn, bpf->prog, bpf->extack);









	if (err)









		return err;
































drivers/net/ethernet/ti/cpsw_priv.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -1265,9 +1265,6 @@ static int cpsw_xdp_prog_setup(struct cpsw_priv *priv, struct netdev_bpf *bpf)







	if (!priv->xdpi.prog && !prog)









		return 0;



















	if (!xdp_attachment_flags_ok(&priv->xdpi, bpf))









		return -EBUSY;



















	WRITE_ONCE(priv->xdp_prog, prog);



















	xdp_attachment_setup(&priv->xdpi, bpf);
































drivers/net/netdevsim/bpf.c



+10
−5






























Original line number
Diff line number
Diff line







@@ -63,15 +63,20 @@ static int







nsim_bpf_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn)









{









	struct nsim_bpf_bound_prog *state;









	int ret = 0;



















	state = env->prog->aux->offload->dev_priv;









	if (state->nsim_dev->bpf_bind_verifier_delay && !insn_idx)









		msleep(state->nsim_dev->bpf_bind_verifier_delay);



















	if (insn_idx == env->prog->len - 1)









	if (insn_idx == env->prog->len - 1) {









		pr_vlog(env, "Hello from netdevsim!\n");



















	return 0;









		if (!state->nsim_dev->bpf_bind_verifier_accept)









			ret = -EOPNOTSUPP;









	}



















	return ret;









}



















static int nsim_bpf_finalize(struct bpf_verifier_env *env)








@@ -190,9 +195,6 @@ nsim_xdp_set_prog(struct netdevsim *ns, struct netdev_bpf *bpf,







{









	int err;



















	if (!xdp_attachment_flags_ok(xdp, bpf))









		return -EBUSY;



















	if (bpf->command == XDP_SETUP_PROG && !ns->bpf_xdpdrv_accept) {









		NSIM_EA(bpf->extack, "driver XDP disabled in DebugFS");









		return -EOPNOTSUPP;








@@ -598,6 +600,9 @@ int nsim_bpf_dev_init(struct nsim_dev *nsim_dev)







			    &nsim_dev->bpf_bind_accept);









	debugfs_create_u32("bpf_bind_verifier_delay", 0600, nsim_dev->ddir,









			   &nsim_dev->bpf_bind_verifier_delay);









	nsim_dev->bpf_bind_verifier_accept = true;









	debugfs_create_bool("bpf_bind_verifier_accept", 0600, nsim_dev->ddir,









			    &nsim_dev->bpf_bind_verifier_accept);









	return 0;









}










































drivers/net/netdevsim/netdevsim.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -189,6 +189,7 @@ struct nsim_dev {







	struct dentry *take_snapshot;









	struct bpf_offload_dev *bpf_dev;









	bool bpf_bind_accept;









	bool bpf_bind_verifier_accept;









	u32 bpf_bind_verifier_delay;









	struct dentry *ddir_bpf_bound_progs;









	u32 prog_id_gen;








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE