Commit fa7566a0 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-06-12

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

We've added 26 non-merge commits during the last 10 day(s) which contain
a total of 27 files changed, 348 insertions(+), 93 deletions(-).

The main changes are:

1) sock_hash accounting fix, from Andrey.

2) libbpf fix and probe_mem sanitizing, from Andrii.

3) sock_hash fixes, from Jakub.

4) devmap_val fix, from Jesper.

5) load_bytes_relative fix, from YiFei.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bf97bac9 29fcb05b

include/uapi/linux/bpf.h

+13 −0
Original line number Diff line number Diff line
@@ -3761,6 +3761,19 @@ struct xdp_md { 
	__u32 egress_ifindex;  /* txq->dev->ifindex */

};



/* DEVMAP map-value layout

 *

 * The struct data-layout of map-value is a configuration interface.

 * New members can only be added to the end of this structure.

 */

struct bpf_devmap_val {

	__u32 ifindex;   /* device index */

	union {

		int   fd;  /* prog fd on map write */

		__u32 id;  /* prog id on map read */

	} bpf_prog;

};



enum sk_action {

	SK_DROP = 0,

	SK_PASS,

kernel/bpf/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static struct bpf_prog_list *find_attach_entry(struct list_head *progs, 
	}



	list_for_each_entry(pl, progs, node) {

		if (prog && pl->prog == prog)

		if (prog && pl->prog == prog && prog != replace_prog)

			/* disallow attaching the same prog twice */

			return ERR_PTR(-EINVAL);

		if (link && pl->link == link)

kernel/bpf/devmap.c

+5 −13
Original line number Diff line number Diff line
@@ -60,15 +60,6 @@ struct xdp_dev_bulk_queue { 
	unsigned int count;

};



/* DEVMAP values */

struct bpf_devmap_val {

	u32 ifindex;   /* device index */

	union {

		int fd;  /* prog fd on map write */

		u32 id;  /* prog id on map read */

	} bpf_prog;

};



struct bpf_dtab_netdev {

	struct net_device *dev; /* must be first member, due to tracepoint */

	struct hlist_node index_hlist;
@@ -479,6 +470,7 @@ static struct xdp_buff *dev_map_run_prog(struct net_device *dev, 
	struct xdp_txq_info txq = { .dev = dev };

	u32 act;



	xdp_set_data_meta_invalid(xdp);

	xdp->txq = &txq;



	act = bpf_prog_run_xdp(xdp_prog, xdp);
@@ -618,7 +610,7 @@ static struct bpf_dtab_netdev *__dev_map_alloc_node(struct net *net, 
	if (!dev->dev)

		goto err_out;



	if (val->bpf_prog.fd >= 0) {

	if (val->bpf_prog.fd > 0) {

		prog = bpf_prog_get_type_dev(val->bpf_prog.fd,

					     BPF_PROG_TYPE_XDP, false);

		if (IS_ERR(prog))
@@ -652,8 +644,8 @@ static int __dev_map_update_elem(struct net *net, struct bpf_map *map, 
				 void *key, void *value, u64 map_flags)

{

	struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);

	struct bpf_devmap_val val = { .bpf_prog.fd = -1 };

	struct bpf_dtab_netdev *dev, *old_dev;

	struct bpf_devmap_val val = {};

	u32 i = *(u32 *)key;



	if (unlikely(map_flags > BPF_EXIST))
@@ -669,7 +661,7 @@ static int __dev_map_update_elem(struct net *net, struct bpf_map *map, 
	if (!val.ifindex) {

		dev = NULL;

		/* can not specify fd if ifindex is 0 */

		if (val.bpf_prog.fd != -1)

		if (val.bpf_prog.fd > 0)

			return -EINVAL;

	} else {

		dev = __dev_map_alloc_node(net, dtab, &val, i);
@@ -699,8 +691,8 @@ static int __dev_map_hash_update_elem(struct net *net, struct bpf_map *map, 
				     void *key, void *value, u64 map_flags)

{

	struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);

	struct bpf_devmap_val val = { .bpf_prog.fd = -1 };

	struct bpf_dtab_netdev *dev, *old_dev;

	struct bpf_devmap_val val = {};

	u32 idx = *(u32 *)key;

	unsigned long flags;

	int err = -EEXIST;

kernel/bpf/syscall.c

+12 −5
Original line number Diff line number Diff line
@@ -3158,6 +3158,7 @@ static struct bpf_insn *bpf_insn_prepare_dump(const struct bpf_prog *prog) 
	struct bpf_insn *insns;

	u32 off, type;

	u64 imm;

	u8 code;

	int i;



	insns = kmemdup(prog->insnsi, bpf_prog_insn_size(prog),
@@ -3166,21 +3167,27 @@ static struct bpf_insn *bpf_insn_prepare_dump(const struct bpf_prog *prog) 
		return insns;



	for (i = 0; i < prog->len; i++) {

		if (insns[i].code == (BPF_JMP | BPF_TAIL_CALL)) {

		code = insns[i].code;



		if (code == (BPF_JMP | BPF_TAIL_CALL)) {

			insns[i].code = BPF_JMP | BPF_CALL;

			insns[i].imm = BPF_FUNC_tail_call;

			/* fall-through */

		}

		if (insns[i].code == (BPF_JMP | BPF_CALL) ||

		    insns[i].code == (BPF_JMP | BPF_CALL_ARGS)) {

			if (insns[i].code == (BPF_JMP | BPF_CALL_ARGS))

		if (code == (BPF_JMP | BPF_CALL) ||

		    code == (BPF_JMP | BPF_CALL_ARGS)) {

			if (code == (BPF_JMP | BPF_CALL_ARGS))

				insns[i].code = BPF_JMP | BPF_CALL;

			if (!bpf_dump_raw_ok())

				insns[i].imm = 0;

			continue;

		}

		if (BPF_CLASS(code) == BPF_LDX && BPF_MODE(code) == BPF_PROBE_MEM) {

			insns[i].code = BPF_LDX | BPF_SIZE(code) | BPF_MEM;

			continue;

		}



		if (insns[i].code != (BPF_LD | BPF_IMM | BPF_DW))

		if (code != (BPF_LD | BPF_IMM | BPF_DW))

			continue;



		imm = ((u64)insns[i + 1].imm << 32) | (u32)insns[i].imm;

kernel/bpf/verifier.c

+1 −1
Original line number Diff line number Diff line
@@ -7552,7 +7552,7 @@ static int check_btf_func(struct bpf_verifier_env *env, 
	const struct btf *btf;

	void __user *urecord;

	u32 prev_offset = 0;

	int ret = 0;

	int ret = -ENOMEM;



	nfuncs = attr->func_info_cnt;

	if (!nfuncs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE