Commit 40fc7ad2 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 2020-04-10

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

We've added 13 non-merge commits during the last 7 day(s) which contain
a total of 13 files changed, 137 insertions(+), 43 deletions(-).

The main changes are:

1) JIT code emission fixes for riscv and arm32, from Luke Nelson and Xi Wang.

2) Disable vmlinux BTF info if GCC_PLUGIN_RANDSTRUCT is used, from Slava Bacherikov.

3) Fix oob write in AF_XDP when meta data is used, from Li RongQing.

4) Fix bpf_get_link_xdp_id() handling on single prog when flags are specified,
   from Andrey Ignatov.

5) Fix sk_assign() BPF helper for request sockets that can have sk_reuseport
   field uninitialized, from Joe Stringer.

6) Fix mprotect() test case for the BPF LSM, from KP Singh.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 690cc863 bb9562cf

arch/arm/net/bpf_jit_32.c

+10 −2
Original line number Diff line number Diff line
@@ -929,7 +929,11 @@ static inline void emit_a32_rsh_i64(const s8 dst[], 
	rd = arm_bpf_get_reg64(dst, tmp, ctx);



	/* Do LSR operation */

	if (val < 32) {

	if (val == 0) {

		/* An immediate value of 0 encodes a shift amount of 32

		 * for LSR. To shift by 0, don't do anything.

		 */

	} else if (val < 32) {

		emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);

		emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);

		emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_LSR, val), ctx);
@@ -955,7 +959,11 @@ static inline void emit_a32_arsh_i64(const s8 dst[], 
	rd = arm_bpf_get_reg64(dst, tmp, ctx);



	/* Do ARSH operation */

	if (val < 32) {

	if (val == 0) {

		/* An immediate value of 0 encodes a shift amount of 32

		 * for ASR. To shift by 0, don't do anything.

		 */

	} else if (val < 32) {

		emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);

		emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);

		emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_ASR, val), ctx);

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config RISCV 
	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_MMIOWB

	select ARCH_HAS_DEBUG_VIRTUAL

	select HAVE_EBPF_JIT

	select HAVE_EBPF_JIT if MMU

	select EDAC_SUPPORT

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT

arch/riscv/net/bpf_jit_comp64.c

+32 −17
Original line number Diff line number Diff line
@@ -110,6 +110,16 @@ static bool is_32b_int(s64 val) 
	return -(1L << 31) <= val && val < (1L << 31);

}



static bool in_auipc_jalr_range(s64 val)

{

	/*

	 * auipc+jalr can reach any signed PC-relative offset in the range

	 * [-2^31 - 2^11, 2^31 - 2^11).

	 */

	return (-(1L << 31) - (1L << 11)) <= val &&

		val < ((1L << 31) - (1L << 11));

}



static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)

{

	/* Note that the immediate from the add is sign-extended,
@@ -380,20 +390,24 @@ static void emit_sext_32_rd(u8 *rd, struct rv_jit_context *ctx) 
	*rd = RV_REG_T2;

}



static void emit_jump_and_link(u8 rd, s64 rvoff, bool force_jalr,

static int emit_jump_and_link(u8 rd, s64 rvoff, bool force_jalr,

			      struct rv_jit_context *ctx)

{

	s64 upper, lower;



	if (rvoff && is_21b_int(rvoff) && !force_jalr) {

		emit(rv_jal(rd, rvoff >> 1), ctx);

		return;

	}



		return 0;

	} else if (in_auipc_jalr_range(rvoff)) {

		upper = (rvoff + (1 << 11)) >> 12;

		lower = rvoff & 0xfff;

		emit(rv_auipc(RV_REG_T1, upper), ctx);

		emit(rv_jalr(rd, RV_REG_T1, lower), ctx);

		return 0;

	}



	pr_err("bpf-jit: target offset 0x%llx is out of range\n", rvoff);

	return -ERANGE;

}



static bool is_signed_bpf_cond(u8 cond)
@@ -407,18 +421,16 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx) 
	s64 off = 0;

	u64 ip;

	u8 rd;

	int ret;



	if (addr && ctx->insns) {

		ip = (u64)(long)(ctx->insns + ctx->ninsns);

		off = addr - ip;

		if (!is_32b_int(off)) {

			pr_err("bpf-jit: target call addr %pK is out of range\n",

			       (void *)addr);

			return -ERANGE;

		}

	}



	emit_jump_and_link(RV_REG_RA, off, !fixed, ctx);

	ret = emit_jump_and_link(RV_REG_RA, off, !fixed, ctx);

	if (ret)

		return ret;

	rd = bpf_to_rv_reg(BPF_REG_0, ctx);

	emit(rv_addi(rd, RV_REG_A0, 0), ctx);

	return 0;
@@ -429,7 +441,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, 
{

	bool is64 = BPF_CLASS(insn->code) == BPF_ALU64 ||

		    BPF_CLASS(insn->code) == BPF_JMP;

	int s, e, rvoff, i = insn - ctx->prog->insnsi;

	int s, e, rvoff, ret, i = insn - ctx->prog->insnsi;

	struct bpf_prog_aux *aux = ctx->prog->aux;

	u8 rd = -1, rs = -1, code = insn->code;

	s16 off = insn->off;
@@ -699,7 +711,9 @@ out_be: 
	/* JUMP off */

	case BPF_JMP | BPF_JA:

		rvoff = rv_offset(i, off, ctx);

		emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);

		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);

		if (ret)

			return ret;

		break;



	/* IF (dst COND src) JUMP off */
@@ -801,7 +815,6 @@ out_be: 
	case BPF_JMP | BPF_CALL:

	{

		bool fixed;

		int ret;

		u64 addr;



		mark_call(ctx);
@@ -826,7 +839,9 @@ out_be: 
			break;



		rvoff = epilogue_offset(ctx);

		emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);

		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);

		if (ret)

			return ret;

		break;



	/* dst = imm64 */

kernel/bpf/bpf_lru_list.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct bpf_lru_node { 
struct bpf_lru_list {

	struct list_head lists[NR_BPF_LRU_LIST_T];

	unsigned int counts[NR_BPF_LRU_LIST_COUNT];

	/* The next inacitve list rotation starts from here */

	/* The next inactive list rotation starts from here */

	struct list_head *next_inactive_rotation;



	raw_spinlock_t lock ____cacheline_aligned_in_smp;

lib/Kconfig.debug

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ config DEBUG_INFO_DWARF4 
config DEBUG_INFO_BTF

	bool "Generate BTF typeinfo"

	depends on DEBUG_INFO

	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED

	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST

	help

	  Generate deduplicated BTF type information from DWARF debug info.

	  Turning this on expects presence of pahole tool, which will convert

CRA Git | Maintained and supported by SUSTech CRA and CCSE