Commit 1391040b authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf-misc-improvements' 



Daniel Borkmann says:

====================
This series adds various misc improvements to BPF: detection
of BPF helper definition misconfiguration for mem/size argument
pairs, csum_diff helper also for XDP, various test cases,
removal of the recently added pure_initcall(), restriction
of the jit sysctls to cap_sys_admin for initns, a minor size
improvement for x86 jit in alu ops, output of complexity limit
to verifier log and last but not least having the event output
more flexible with moving to const_size_or_zero type.

Thanks!
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents 417f1d9f 1728a4f2

arch/arm/net/bpf_jit_32.c

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include "bpf_jit_32.h"



int bpf_jit_enable __read_mostly;



#define STACK_OFFSET(k)	(k)

#define TMP_REG_1	(MAX_BPF_JIT_REG + 0)	/* TEMP Register 1 */

#define TMP_REG_2	(MAX_BPF_JIT_REG + 1)	/* TEMP Register 2 */

arch/arm64/net/bpf_jit_comp.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#include "bpf_jit.h"



int bpf_jit_enable __read_mostly;



#define TMP_REG_1 (MAX_BPF_JIT_REG + 0)

#define TMP_REG_2 (MAX_BPF_JIT_REG + 1)

#define TCALL_CNT (MAX_BPF_JIT_REG + 2)

arch/mips/net/bpf_jit.c

+0 −2
Original line number Diff line number Diff line
@@ -1207,8 +1207,6 @@ jmp_cmp: 
	return 0;

}



int bpf_jit_enable __read_mostly;



void bpf_jit_compile(struct bpf_prog *fp)

{

	struct jit_ctx ctx;

arch/mips/net/ebpf_jit.c

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ static u32 b_imm(unsigned int tgt, struct jit_ctx *ctx) 
		(ctx->idx * 4) - 4;

}



int bpf_jit_enable __read_mostly;



enum which_ebpf_reg {

	src_reg,

	src_reg_no_fp,

arch/powerpc/net/bpf_jit_comp.c

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include "bpf_jit32.h"



int bpf_jit_enable __read_mostly;



static inline void bpf_flush_icache(void *start, void *end)

{

	smp_wmb();

CRA Git | Maintained and supported by SUSTech CRA and CCSE