Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'bpf-misc-next' 



Daniel Borkmann says:

====================
BPF cleanups and misc updates

This patch set adds couple of cleanups in first few patches,
exposes owner_prog_type for array maps as well as mlocked mem
for maps in fdinfo, allows for mount permissions in fs and
fixes various outstanding issues in selftests and samples.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e3739099 e00c7b21

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

+1 −1
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ static int nfp_net_run_xdp(struct bpf_prog *prog, void *data, unsigned int len) 
	xdp.data = data;

	xdp.data_end = data + len;



	return BPF_PROG_RUN(prog, (void *)&xdp);

	return BPF_PROG_RUN(prog, &xdp);

}



/**

include/linux/filter.h

+3 −3
Original line number Diff line number Diff line
@@ -408,8 +408,8 @@ struct bpf_prog { 
	enum bpf_prog_type	type;		/* Type of BPF program */

	struct bpf_prog_aux	*aux;		/* Auxiliary fields */

	struct sock_fprog_kern	*orig_prog;	/* Original BPF program */

	unsigned int		(*bpf_func)(const struct sk_buff *skb,

					    const struct bpf_insn *filter);

	unsigned int		(*bpf_func)(const void *ctx,

					    const struct bpf_insn *insn);

	/* Instructions for interpreter */

	union {

		struct sock_filter	insns[0];
@@ -504,7 +504,7 @@ static inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog, 
	u32 ret;



	rcu_read_lock();

	ret = BPF_PROG_RUN(prog, (void *)xdp);

	ret = BPF_PROG_RUN(prog, xdp);

	rcu_read_unlock();



	return ret;

include/linux/if_arp.h

+16 −0
Original line number Diff line number Diff line
@@ -44,4 +44,20 @@ static inline int arp_hdr_len(struct net_device *dev) 
		return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2;

	}

}



static inline bool dev_is_mac_header_xmit(const struct net_device *dev)

{

	switch (dev->type) {

	case ARPHRD_TUNNEL:

	case ARPHRD_TUNNEL6:

	case ARPHRD_SIT:

	case ARPHRD_IPGRE:

	case ARPHRD_VOID:

	case ARPHRD_NONE:

		return false;

	default:

		return true;

	}

}



#endif	/* _LINUX_IF_ARP_H */

kernel/bpf/inode.c

+53 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/namei.h>

#include <linux/fs.h>

#include <linux/kdev_t.h>

#include <linux/parser.h>

#include <linux/filter.h>

#include <linux/bpf.h>
@@ -364,15 +365,66 @@ static void bpf_evict_inode(struct inode *inode) 
static const struct super_operations bpf_super_ops = {

	.statfs		= simple_statfs,

	.drop_inode	= generic_delete_inode,

	.show_options	= generic_show_options,

	.evict_inode	= bpf_evict_inode,

};



enum {

	OPT_MODE,

	OPT_ERR,

};



static const match_table_t bpf_mount_tokens = {

	{ OPT_MODE, "mode=%o" },

	{ OPT_ERR, NULL },

};



struct bpf_mount_opts {

	umode_t mode;

};



static int bpf_parse_options(char *data, struct bpf_mount_opts *opts)

{

	substring_t args[MAX_OPT_ARGS];

	int option, token;

	char *ptr;



	opts->mode = S_IRWXUGO;



	while ((ptr = strsep(&data, ",")) != NULL) {

		if (!*ptr)

			continue;



		token = match_token(ptr, bpf_mount_tokens, args);

		switch (token) {

		case OPT_MODE:

			if (match_octal(&args[0], &option))

				return -EINVAL;

			opts->mode = option & S_IALLUGO;

			break;

		/* We might like to report bad mount options here, but

		 * traditionally we've ignored all mount options, so we'd

		 * better continue to ignore non-existing options for bpf.

		 */

		}

	}



	return 0;

}



static int bpf_fill_super(struct super_block *sb, void *data, int silent)

{

	static struct tree_descr bpf_rfiles[] = { { "" } };

	struct bpf_mount_opts opts;

	struct inode *inode;

	int ret;



	save_mount_options(sb, data);



	ret = bpf_parse_options(data, &opts);

	if (ret)

		return ret;



	ret = simple_fill_super(sb, BPF_FS_MAGIC, bpf_rfiles);

	if (ret)

		return ret;
@@ -382,7 +434,7 @@ static int bpf_fill_super(struct super_block *sb, void *data, int silent) 
	inode = sb->s_root->d_inode;

	inode->i_op = &bpf_dir_iops;

	inode->i_mode &= ~S_IALLUGO;

	inode->i_mode |= S_ISVTX | S_IRWXUGO;

	inode->i_mode |= S_ISVTX | opts.mode;



	return 0;

}

kernel/bpf/syscall.c

+15 −2
Original line number Diff line number Diff line
@@ -138,18 +138,31 @@ static int bpf_map_release(struct inode *inode, struct file *filp) 
static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp)

{

	const struct bpf_map *map = filp->private_data;

	const struct bpf_array *array;

	u32 owner_prog_type = 0;



	if (map->map_type == BPF_MAP_TYPE_PROG_ARRAY) {

		array = container_of(map, struct bpf_array, map);

		owner_prog_type = array->owner_prog_type;

	}



	seq_printf(m,

		   "map_type:\t%u\n"

		   "key_size:\t%u\n"

		   "value_size:\t%u\n"

		   "max_entries:\t%u\n"

		   "map_flags:\t%#x\n",

		   "map_flags:\t%#x\n"

		   "memlock:\t%llu\n",

		   map->map_type,

		   map->key_size,

		   map->value_size,

		   map->max_entries,

		   map->map_flags);

		   map->map_flags,

		   map->pages * 1ULL << PAGE_SHIFT);



	if (owner_prog_type)

		seq_printf(m, "owner_prog_type:\t%u\n",

			   owner_prog_type);

}

#endif