Commit 242a6df6 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-03-12

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

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

The main changes are:

1) Andrii fixed two bugs in cgroup-bpf.

2) John fixed sockmap.

3) Luke fixed x32 jit.

4) Martin fixed two issues in struct_ops.

5) Yonghong fixed bpf_send_signal.

6) Yoshiki fixed BTF enum.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0d81a3f2 90db6d77

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> 
Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajesh Shah <rajesh.shah@intel.com>

arch/x86/net/bpf_jit_comp32.c

+6 −4
Original line number Diff line number Diff line
@@ -2039,10 +2039,12 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, 
			}

			/* and dreg_lo,sreg_lo */

			EMIT2(0x23, add_2reg(0xC0, sreg_lo, dreg_lo));

			if (is_jmp64) {

				/* and dreg_hi,sreg_hi */

				EMIT2(0x23, add_2reg(0xC0, sreg_hi, dreg_hi));

				/* or dreg_lo,dreg_hi */

				EMIT2(0x09, add_2reg(0xC0, dreg_lo, dreg_hi));

			}

			goto emit_cond_jmp;

		}

		case BPF_JMP | BPF_JSET | BPF_K:

kernel/bpf/bpf_struct_ops.c

+11 −3
Original line number Diff line number Diff line
@@ -482,13 +482,21 @@ static int bpf_struct_ops_map_delete_elem(struct bpf_map *map, void *key) 
	prev_state = cmpxchg(&st_map->kvalue.state,

			     BPF_STRUCT_OPS_STATE_INUSE,

			     BPF_STRUCT_OPS_STATE_TOBEFREE);

	if (prev_state == BPF_STRUCT_OPS_STATE_INUSE) {

	switch (prev_state) {

	case BPF_STRUCT_OPS_STATE_INUSE:

		st_map->st_ops->unreg(&st_map->kvalue.data);

		if (refcount_dec_and_test(&st_map->kvalue.refcnt))

			bpf_map_put(map);

	}



		return 0;

	case BPF_STRUCT_OPS_STATE_TOBEFREE:

		return -EINPROGRESS;

	case BPF_STRUCT_OPS_STATE_INIT:

		return -ENOENT;

	default:

		WARN_ON_ONCE(1);

		/* Should never happen.  Treat it as not found. */

		return -ENOENT;

	}

}



static void bpf_struct_ops_map_seq_show_elem(struct bpf_map *map, void *key,

kernel/bpf/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -2418,7 +2418,7 @@ static int btf_enum_check_member(struct btf_verifier_env *env, 


	struct_size = struct_type->size;

	bytes_offset = BITS_ROUNDDOWN_BYTES(struct_bits_off);

	if (struct_size - bytes_offset < sizeof(int)) {

	if (struct_size - bytes_offset < member_type->size) {

		btf_verifier_log_member(env, struct_type, member,

					"Member exceeds struct_size");

		return -EINVAL;

kernel/bpf/cgroup.c

+5 −2
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ cleanup: 
	for (i = 0; i < NR; i++)

		bpf_prog_array_free(arrays[i]);



	for (p = cgroup_parent(cgrp); p; p = cgroup_parent(p))

		cgroup_bpf_put(p);



	percpu_ref_exit(&cgrp->bpf.refcnt);



	return -ENOMEM;
@@ -302,8 +305,8 @@ int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog, 
	u32 saved_flags = (flags & (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI));

	struct list_head *progs = &cgrp->bpf.progs[type];

	struct bpf_prog *old_prog = NULL;

	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE],

		*old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {NULL};

	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};

	struct bpf_cgroup_storage *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};

	struct bpf_prog_list *pl, *replace_pl = NULL;

	enum bpf_cgroup_storage_type stype;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE