Commit 22a12790 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'Fix up bpf_jit_limit some more' 



Lorenz Bauer says:

====================
Fix some inconsistencies of bpf_jit_limit on non-x86 platforms.
I've dropped exposing bpf_jit_current since we couldn't agree on
file modes, correct names, etc.
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 4225fea1 fadb7ff1

arch/arm64/net/bpf_jit_comp.c

+5 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	return prog;

}



u64 bpf_jit_alloc_exec_limit(void)

{

	return BPF_JIT_REGION_SIZE;

}



void *bpf_jit_alloc_exec(unsigned long size)

{

	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,

arch/riscv/net/bpf_jit_core.c

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	return prog;

}



u64 bpf_jit_alloc_exec_limit(void)

{

	return BPF_JIT_REGION_SIZE;

}



void *bpf_jit_alloc_exec(unsigned long size)

{

	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,

include/linux/filter.h

+1 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,7 @@ extern int bpf_jit_enable; 
extern int bpf_jit_harden;

extern int bpf_jit_kallsyms;

extern long bpf_jit_limit;

extern long bpf_jit_limit_max;



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

kernel/bpf/core.c

+3 −1
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ int bpf_jit_enable __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_DEFAULT_ON); 
int bpf_jit_kallsyms __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_DEFAULT_ON);

int bpf_jit_harden   __read_mostly;

long bpf_jit_limit   __read_mostly;

long bpf_jit_limit_max __read_mostly;



static void

bpf_prog_ksym_set_addr(struct bpf_prog *prog)
@@ -817,7 +818,8 @@ u64 __weak bpf_jit_alloc_exec_limit(void) 
static int __init bpf_jit_charge_init(void)

{

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

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

	bpf_jit_limit_max = bpf_jit_alloc_exec_limit();

	bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 2,

					    PAGE_SIZE), LONG_MAX);

	return 0;

}

net/core/sysctl_net_core.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static struct ctl_table net_core_table[] = { 
		.mode		= 0600,

		.proc_handler	= proc_dolongvec_minmax_bpf_restricted,

		.extra1		= &long_one,

		.extra2		= &long_max,

		.extra2		= &bpf_jit_limit_max,

	},

#endif

	{