Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1651e39e authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf-improvements-and-fixes' 



Daniel Borkmann says:

====================
This set contains a small cleanup in cBPF prologue generation and
otherwise fixes an outstanding issue related to BPF to BPF calls
and exception handling. For details please see related patches.
Last but not least, BPF selftests is extended with several new
test cases.

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

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents c25ef6a5 21ccaf21

arch/arm/net/bpf_jit_32.c

+0 −8
Original line number Diff line number Diff line
@@ -363,15 +363,7 @@ static inline int epilogue_offset(const struct jit_ctx *ctx) 
static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)

{

	const u8 *tmp = bpf2a32[TMP_REG_1];

	s32 jmp_offset;



	/* checks if divisor is zero or not. If it is, then

	 * exit directly.

	 */

	emit(ARM_CMP_I(rn, 0), ctx);

	_emit(ARM_COND_EQ, ARM_MOV_I(ARM_R0, 0), ctx);

	jmp_offset = epilogue_offset(ctx);

	_emit(ARM_COND_EQ, ARM_B(jmp_offset), ctx);

#if __LINUX_ARM_ARCH__ == 7

	if (elf_hwcap & HWCAP_IDIVA) {

		if (op == BPF_DIV)

arch/arm64/net/bpf_jit_comp.c

+0 −13
Original line number Diff line number Diff line
@@ -390,18 +390,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
	case BPF_ALU64 | BPF_DIV | BPF_X:

	case BPF_ALU | BPF_MOD | BPF_X:

	case BPF_ALU64 | BPF_MOD | BPF_X:

	{

		const u8 r0 = bpf2a64[BPF_REG_0];



		/* if (src == 0) return 0 */

		jmp_offset = 3; /* skip ahead to else path */

		check_imm19(jmp_offset);

		emit(A64_CBNZ(is64, src, jmp_offset), ctx);

		emit(A64_MOVZ(1, r0, 0, 0), ctx);

		jmp_offset = epilogue_offset(ctx);

		check_imm26(jmp_offset);

		emit(A64_B(jmp_offset), ctx);

		/* else */

		switch (BPF_OP(code)) {

		case BPF_DIV:

			emit(A64_UDIV(is64, dst, dst, src), ctx);
@@ -413,7 +401,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
			break;

		}

		break;

	}

	case BPF_ALU | BPF_LSH | BPF_X:

	case BPF_ALU64 | BPF_LSH | BPF_X:

		emit(A64_LSLV(is64, dst, dst, src), ctx);

arch/mips/net/ebpf_jit.c

+4 −25
Original line number Diff line number Diff line
@@ -741,16 +741,11 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		break;

	case BPF_ALU | BPF_DIV | BPF_K: /* ALU_IMM */

	case BPF_ALU | BPF_MOD | BPF_K: /* ALU_IMM */

		if (insn->imm == 0)

			return -EINVAL;

		dst = ebpf_to_mips_reg(ctx, insn, dst_reg);

		if (dst < 0)

			return dst;

		if (insn->imm == 0) { /* Div by zero */

			b_off = b_imm(exit_idx, ctx);

			if (is_bad_offset(b_off))

				return -E2BIG;

			emit_instr(ctx, beq, MIPS_R_ZERO, MIPS_R_ZERO, b_off);

			emit_instr(ctx, addu, MIPS_R_V0, MIPS_R_ZERO, MIPS_R_ZERO);

		}

		td = get_reg_val_type(ctx, this_idx, insn->dst_reg);

		if (td == REG_64BIT || td == REG_32BIT_ZERO_EX)

			/* sign extend */
@@ -770,19 +765,13 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		break;

	case BPF_ALU64 | BPF_DIV | BPF_K: /* ALU_IMM */

	case BPF_ALU64 | BPF_MOD | BPF_K: /* ALU_IMM */

		if (insn->imm == 0)

			return -EINVAL;

		dst = ebpf_to_mips_reg(ctx, insn, dst_reg);

		if (dst < 0)

			return dst;

		if (insn->imm == 0) { /* Div by zero */

			b_off = b_imm(exit_idx, ctx);

			if (is_bad_offset(b_off))

				return -E2BIG;

			emit_instr(ctx, beq, MIPS_R_ZERO, MIPS_R_ZERO, b_off);

			emit_instr(ctx, addu, MIPS_R_V0, MIPS_R_ZERO, MIPS_R_ZERO);

		}

		if (get_reg_val_type(ctx, this_idx, insn->dst_reg) == REG_32BIT)

			emit_instr(ctx, dinsu, dst, MIPS_R_ZERO, 32, 32);



		if (insn->imm == 1) {

			/* div by 1 is a nop, mod by 1 is zero */

			if (bpf_op == BPF_MOD)
@@ -860,11 +849,6 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
			break;

		case BPF_DIV:

		case BPF_MOD:

			b_off = b_imm(exit_idx, ctx);

			if (is_bad_offset(b_off))

				return -E2BIG;

			emit_instr(ctx, beq, src, MIPS_R_ZERO, b_off);

			emit_instr(ctx, movz, MIPS_R_V0, MIPS_R_ZERO, src);

			emit_instr(ctx, ddivu, dst, src);

			if (bpf_op == BPF_DIV)

				emit_instr(ctx, mflo, dst);
@@ -943,11 +927,6 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
			break;

		case BPF_DIV:

		case BPF_MOD:

			b_off = b_imm(exit_idx, ctx);

			if (is_bad_offset(b_off))

				return -E2BIG;

			emit_instr(ctx, beq, src, MIPS_R_ZERO, b_off);

			emit_instr(ctx, movz, MIPS_R_V0, MIPS_R_ZERO, src);

			emit_instr(ctx, divu, dst, src);

			if (bpf_op == BPF_DIV)

				emit_instr(ctx, mflo, dst);

arch/powerpc/net/bpf_jit_comp64.c

+0 −8
Original line number Diff line number Diff line
@@ -381,10 +381,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, 
			goto bpf_alu32_trunc;

		case BPF_ALU | BPF_DIV | BPF_X: /* (u32) dst /= (u32) src */

		case BPF_ALU | BPF_MOD | BPF_X: /* (u32) dst %= (u32) src */

			PPC_CMPWI(src_reg, 0);

			PPC_BCC_SHORT(COND_NE, (ctx->idx * 4) + 12);

			PPC_LI(b2p[BPF_REG_0], 0);

			PPC_JMP(exit_addr);

			if (BPF_OP(code) == BPF_MOD) {

				PPC_DIVWU(b2p[TMP_REG_1], dst_reg, src_reg);

				PPC_MULW(b2p[TMP_REG_1], src_reg,
@@ -395,10 +391,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, 
			goto bpf_alu32_trunc;

		case BPF_ALU64 | BPF_DIV | BPF_X: /* dst /= src */

		case BPF_ALU64 | BPF_MOD | BPF_X: /* dst %= src */

			PPC_CMPDI(src_reg, 0);

			PPC_BCC_SHORT(COND_NE, (ctx->idx * 4) + 12);

			PPC_LI(b2p[BPF_REG_0], 0);

			PPC_JMP(exit_addr);

			if (BPF_OP(code) == BPF_MOD) {

				PPC_DIVD(b2p[TMP_REG_1], dst_reg, src_reg);

				PPC_MULD(b2p[TMP_REG_1], src_reg,

arch/s390/net/bpf_jit_comp.c

+0 −10
Original line number Diff line number Diff line
@@ -610,11 +610,6 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
	{

		int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;



		jit->seen |= SEEN_RET0;

		/* ltr %src,%src (if src == 0 goto fail) */

		EMIT2(0x1200, src_reg, src_reg);

		/* jz <ret0> */

		EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg);

		/* lhi %w0,0 */

		EMIT4_IMM(0xa7080000, REG_W0, 0);

		/* lr %w1,%dst */
@@ -630,11 +625,6 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
	{

		int rc_reg = BPF_OP(insn->code) == BPF_DIV ? REG_W1 : REG_W0;



		jit->seen |= SEEN_RET0;

		/* ltgr %src,%src (if src == 0 goto fail) */

		EMIT4(0xb9020000, src_reg, src_reg);

		/* jz <ret0> */

		EMIT4_PCREL(0xa7840000, jit->ret0_ip - jit->prg);

		/* lghi %w0,0 */

		EMIT4_IMM(0xa7090000, REG_W0, 0);

		/* lgr %w1,%dst */