Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (ea9722e2) · Commits · 戴 / test

Alexei Starovoitov says: ==================== pull-request: bpf-next 2018-01-19 The following pull-request contains BPF updates for your *net-next* tree. The main changes are: 1) bpf array map HW offload, from Jakub. 2) support for bpf_get_next_key() for LPM map, from Yonghong. 3) test_verifier now runs loaded programs, from Alexei. 4) xdp cpumap monitoring, from Jesper. 5) variety of tests, cleanups and small x64 JIT optimization, from Daniel. 6) user space can now retrieve HW JITed program, from Jiong. Note there is a minor conflict between Russell's arm32 JIT fixes and removal of bpf_jit_enable variable by Daniel which should be resolved by keeping Russell's comment and removing that variable. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

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;

		/*
		* eBPF prog stack layout:
		*

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();

Admin message