Commit 41de23e2 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 2019-11-02

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

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

The main changes are:

1) Fix ppc BPF JIT's tail call implementation by performing a second pass
   to gather a stable JIT context before opcode emission, from Eric Dumazet.

2) Fix build of BPF samples sys_perf_event_open() usage to compiled out
   unavailable test_attr__{enabled,open} checks. Also fix potential overflows
   in bpf_map_{area_alloc,charge_init} on 32 bit archs, from Björn Töpel.

3) Fix narrow loads of bpf_sysctl context fields with offset > 0 on big endian
   archs like s390x and also improve the test coverage, from Ilya Leoshkevich.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0763b3e8 7de08690

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3053,6 +3053,7 @@ M: Daniel Borkmann <daniel@iogearbox.net> 
R:	Martin KaFai Lau <kafai@fb.com>

R:	Song Liu <songliubraving@fb.com>

R:	Yonghong Song <yhs@fb.com>

R:	Andrii Nakryiko <andriin@fb.com>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

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

arch/powerpc/net/bpf_jit_comp64.c

+13 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,19 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
		goto out_addrs;

	}



	/*

	 * If we have seen a tail call, we need a second pass.

	 * This is because bpf_jit_emit_common_epilogue() is called

	 * from bpf_jit_emit_tail_call() with a not yet stable ctx->seen.

	 */

	if (cgctx.seen & SEEN_TAILCALL) {

		cgctx.idx = 0;

		if (bpf_jit_build_body(fp, 0, &cgctx, addrs, false)) {

			fp = org_fp;

			goto out_addrs;

		}

	}



	/*

	 * Pretend to build prologue, given the features we've seen.  This will

	 * update ctgtx.idx as it pretends to output instructions, then we can

include/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -656,11 +656,11 @@ void bpf_map_put_with_uref(struct bpf_map *map); 
void bpf_map_put(struct bpf_map *map);

int bpf_map_charge_memlock(struct bpf_map *map, u32 pages);

void bpf_map_uncharge_memlock(struct bpf_map *map, u32 pages);

int bpf_map_charge_init(struct bpf_map_memory *mem, size_t size);

int bpf_map_charge_init(struct bpf_map_memory *mem, u64 size);

void bpf_map_charge_finish(struct bpf_map_memory *mem);

void bpf_map_charge_move(struct bpf_map_memory *dst,

			 struct bpf_map_memory *src);

void *bpf_map_area_alloc(size_t size, int numa_node);

void *bpf_map_area_alloc(u64 size, int numa_node);

void bpf_map_area_free(void *base);

void bpf_map_init_from_attr(struct bpf_map *map, union bpf_attr *attr);

kernel/bpf/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -1311,12 +1311,12 @@ static bool sysctl_is_valid_access(int off, int size, enum bpf_access_type type, 
		return false;



	switch (off) {

	case offsetof(struct bpf_sysctl, write):

	case bpf_ctx_range(struct bpf_sysctl, write):

		if (type != BPF_READ)

			return false;

		bpf_ctx_record_field_size(info, size_default);

		return bpf_ctx_narrow_access_ok(off, size, size_default);

	case offsetof(struct bpf_sysctl, file_pos):

	case bpf_ctx_range(struct bpf_sysctl, file_pos):

		if (type == BPF_READ) {

			bpf_ctx_record_field_size(info, size_default);

			return bpf_ctx_narrow_access_ok(off, size, size_default);

kernel/bpf/syscall.c

+5 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr) 
	return map;

}



void *bpf_map_area_alloc(size_t size, int numa_node)

void *bpf_map_area_alloc(u64 size, int numa_node)

{

	/* We really just want to fail instead of triggering OOM killer

	 * under memory pressure, therefore we set __GFP_NORETRY to kmalloc,
@@ -141,6 +141,9 @@ void *bpf_map_area_alloc(size_t size, int numa_node) 
	const gfp_t flags = __GFP_NOWARN | __GFP_ZERO;

	void *area;



	if (size >= SIZE_MAX)

		return NULL;



	if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {

		area = kmalloc_node(size, GFP_USER | __GFP_NORETRY | flags,

				    numa_node);
@@ -197,7 +200,7 @@ static void bpf_uncharge_memlock(struct user_struct *user, u32 pages) 
		atomic_long_sub(pages, &user->locked_vm);

}



int bpf_map_charge_init(struct bpf_map_memory *mem, size_t size)

int bpf_map_charge_init(struct bpf_map_memory *mem, u64 size)

{

	u32 pages = round_up(size, PAGE_SIZE) >> PAGE_SHIFT;

	struct user_struct *user;

CRA Git | Maintained and supported by SUSTech CRA and CCSE