Commit 10589a56 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 2018-12-15

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

The main changes are:

1) fix liveness propagation of callee saved registers, from Jakub.

2) fix overflow in bpf_jit_limit knob, from Daniel.

3) bpf_flow_dissector api fix, from Stanislav.

4) bpf_perf_event api fix on powerpc, from Sandipan.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 143ece65 7640ead9

arch/powerpc/include/asm/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <asm/ptrace.h>

#include <asm/reg.h>



#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs



/*

 * Overload regs->result to specify whether we should use the MSR (result

 * is zero) or the SIAR (result is non zero).

arch/powerpc/include/uapi/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generic-y += bpf_perf_event.h

generic-y += param.h

generic-y += poll.h

generic-y += resource.h

arch/powerpc/include/uapi/asm/bpf_perf_event.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__

#define _UAPI__ASM_BPF_PERF_EVENT_H__



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

include/linux/filter.h

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ bpf_run_sk_reuseport(struct sock_reuseport *reuse, struct sock *sk, 
extern int bpf_jit_enable;

extern int bpf_jit_harden;

extern int bpf_jit_kallsyms;

extern int bpf_jit_limit;

extern long bpf_jit_limit;



typedef void (*bpf_jit_fill_hole_t)(void *area, unsigned int size);

kernel/bpf/core.c

+15 −6
Original line number Diff line number Diff line
@@ -365,13 +365,11 @@ void bpf_prog_kallsyms_del_all(struct bpf_prog *fp) 
}



#ifdef CONFIG_BPF_JIT

# define BPF_JIT_LIMIT_DEFAULT	(PAGE_SIZE * 40000)



/* All BPF JIT sysctl knobs here. */

int bpf_jit_enable   __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON);

int bpf_jit_harden   __read_mostly;

int bpf_jit_kallsyms __read_mostly;

int bpf_jit_limit    __read_mostly = BPF_JIT_LIMIT_DEFAULT;

long bpf_jit_limit   __read_mostly;



static __always_inline void

bpf_get_prog_addr_region(const struct bpf_prog *prog,
@@ -580,16 +578,27 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type, 


static atomic_long_t bpf_jit_current;



/* Can be overridden by an arch's JIT compiler if it has a custom,

 * dedicated BPF backend memory area, or if neither of the two

 * below apply.

 */

u64 __weak bpf_jit_alloc_exec_limit(void)

{

#if defined(MODULES_VADDR)

	return MODULES_END - MODULES_VADDR;

#else

	return VMALLOC_END - VMALLOC_START;

#endif

}



static int __init bpf_jit_charge_init(void)

{

	/* Only used as heuristic here to derive limit. */

	bpf_jit_limit = min_t(u64, round_up((MODULES_END - MODULES_VADDR) >> 2,

					    PAGE_SIZE), INT_MAX);

	bpf_jit_limit = min_t(u64, round_up(bpf_jit_alloc_exec_limit() >> 2,

					    PAGE_SIZE), LONG_MAX);

	return 0;

}

pure_initcall(bpf_jit_charge_init);

#endif



static int bpf_jit_charge_modmem(u32 pages)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE