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

Commit 740d52c6 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf, sparc64: remove obsolete exception handling from div/mod 



Since we've changed div/mod exception handling for src_reg in
eBPF verifier itself, remove the leftovers from sparc64 JIT.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 53fbf571

arch/sparc/net/bpf_jit_comp_64.c

+0 −18
Original line number Diff line number Diff line
@@ -967,31 +967,17 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
		emit_alu(MULX, src, dst, ctx);

		break;

	case BPF_ALU | BPF_DIV | BPF_X:

		emit_cmp(src, G0, ctx);

		emit_branch(BE|ANNUL, ctx->idx, ctx->epilogue_offset, ctx);

		emit_loadimm(0, bpf2sparc[BPF_REG_0], ctx);



		emit_write_y(G0, ctx);

		emit_alu(DIV, src, dst, ctx);

		break;



	case BPF_ALU64 | BPF_DIV | BPF_X:

		emit_cmp(src, G0, ctx);

		emit_branch(BE|ANNUL, ctx->idx, ctx->epilogue_offset, ctx);

		emit_loadimm(0, bpf2sparc[BPF_REG_0], ctx);



		emit_alu(UDIVX, src, dst, ctx);

		break;



	case BPF_ALU | BPF_MOD | BPF_X: {

		const u8 tmp = bpf2sparc[TMP_REG_1];



		ctx->tmp_1_used = true;



		emit_cmp(src, G0, ctx);

		emit_branch(BE|ANNUL, ctx->idx, ctx->epilogue_offset, ctx);

		emit_loadimm(0, bpf2sparc[BPF_REG_0], ctx);



		emit_write_y(G0, ctx);

		emit_alu3(DIV, dst, src, tmp, ctx);

		emit_alu3(MULX, tmp, src, tmp, ctx);
@@ -1003,10 +989,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 


		ctx->tmp_1_used = true;



		emit_cmp(src, G0, ctx);

		emit_branch(BE|ANNUL, ctx->idx, ctx->epilogue_offset, ctx);

		emit_loadimm(0, bpf2sparc[BPF_REG_0], ctx);



		emit_alu3(UDIVX, dst, src, tmp, ctx);

		emit_alu3(MULX, tmp, src, tmp, ctx);

		emit_alu3(SUB, dst, tmp, dst, ctx);