bpf, s390x: remove obsolete exception handling from div/mod
authorDaniel Borkmann <daniel@iogearbox.net>
Fri, 26 Jan 2018 22:33:42 +0000 (23:33 +0100)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 27 Jan 2018 00:42:06 +0000 (16:42 -0800)
Since we've changed div/mod exception handling for src_reg in
eBPF verifier itself, remove the leftovers from s390x JIT.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
arch/s390/net/bpf_jit_comp.c

index e50188773ff36a54789b3b4dcc05399ef0eac35c..78a19c93b3802ff48b4c27a90d6428100fc5566f 100644 (file)
@@ -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 */