Commit 0ca69d13 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 2018-06-12

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

The main changes are:

1) Avoid an allocation warning in AF_XDP by adding __GFP_NOWARN for the
   umem setup, from Björn.

2) Silence a warning in bpf fs when an application tries to open(2) a
   pinned bpf obj due to missing fops. Add a dummy open fop that continues
   to just bail out in such case, from Daniel.

3) Fix a BPF selftest urandom_read build issue where gcc complains that
   it gets built twice, from Anders.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93ba168a a343993c

kernel/bpf/inode.c

+12 −2
Original line number Diff line number Diff line
@@ -295,6 +295,15 @@ static const struct file_operations bpffs_map_fops = { 
	.release	= bpffs_map_release,

};



static int bpffs_obj_open(struct inode *inode, struct file *file)

{

	return -EIO;

}



static const struct file_operations bpffs_obj_fops = {

	.open		= bpffs_obj_open,

};



static int bpf_mkobj_ops(struct dentry *dentry, umode_t mode, void *raw,

			 const struct inode_operations *iops,

			 const struct file_operations *fops)
@@ -314,7 +323,8 @@ static int bpf_mkobj_ops(struct dentry *dentry, umode_t mode, void *raw, 


static int bpf_mkprog(struct dentry *dentry, umode_t mode, void *arg)

{

	return bpf_mkobj_ops(dentry, mode, arg, &bpf_prog_iops, NULL);

	return bpf_mkobj_ops(dentry, mode, arg, &bpf_prog_iops,

			     &bpffs_obj_fops);

}



static int bpf_mkmap(struct dentry *dentry, umode_t mode, void *arg)
@@ -322,7 +332,7 @@ static int bpf_mkmap(struct dentry *dentry, umode_t mode, void *arg) 
	struct bpf_map *map = arg;



	return bpf_mkobj_ops(dentry, mode, arg, &bpf_map_iops,

			     map->btf ? &bpffs_map_fops : NULL);

			     map->btf ? &bpffs_map_fops : &bpffs_obj_fops);

}



static struct dentry *

net/xdp/xdp_umem.c

+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static int xdp_umem_pin_pages(struct xdp_umem *umem) 
	long npgs;

	int err;



	umem->pgs = kcalloc(umem->npgs, sizeof(*umem->pgs), GFP_KERNEL);

	umem->pgs = kcalloc(umem->npgs, sizeof(*umem->pgs),

			    GFP_KERNEL | __GFP_NOWARN);

	if (!umem->pgs)

		return -ENOMEM;

tools/testing/selftests/bpf/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ LDLIBS += -lcap -lelf -lrt -lpthread 
TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read

all: $(TEST_CUSTOM_PROGS)



$(TEST_CUSTOM_PROGS): urandom_read



urandom_read: urandom_read.c

$(TEST_CUSTOM_PROGS): $(OUTPUT)/%: %.c

	$(CC) -o $(TEST_CUSTOM_PROGS) -static $< -Wl,--build-id



# Order correspond to 'make run_tests' order

CRA Git | Maintained and supported by SUSTech CRA and CCSE