]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
s390/bpf,jit: add support MOD instruction
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Sat, 1 Dec 2012 11:29:08 +0000 (12:29 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 3 Dec 2012 15:44:02 +0000 (10:44 -0500)
Add support for MOD operation for s390's JIT.

Same as 280050cc "x86 bpf_jit: support MOD operation" for x86 which
adds JIT support for the generic new MOD operation introduced with
b6069a9570 "filter: add MOD operation".

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/net/bpf_jit_comp.c

index 9b355b406afaafb924d52f9e8c853f0338a292a0..1ff930167348ebff98bf8915b944e56fb9b677ae 100644 (file)
@@ -341,6 +341,27 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                /* lr %r5,%r4 */
                EMIT2(0x1854);
                break;
+       case BPF_S_ALU_MOD_X: /* A %= X */
+               jit->seen |= SEEN_XREG | SEEN_RET0;
+               /* ltr %r12,%r12 */
+               EMIT2(0x12cc);
+               /* jz <ret0> */
+               EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg));
+               /* lhi %r4,0 */
+               EMIT4(0xa7480000);
+               /* dr %r4,%r12 */
+               EMIT2(0x1d4c);
+               /* lr %r5,%r4 */
+               EMIT2(0x1854);
+               break;
+       case BPF_S_ALU_MOD_K: /* A %= K */
+               /* lhi %r4,0 */
+               EMIT4(0xa7480000);
+               /* d %r4,<d(K)>(%r13) */
+               EMIT4_DISP(0x5d40d000, EMIT_CONST(K));
+               /* lr %r5,%r4 */
+               EMIT2(0x1854);
+               break;
        case BPF_S_ALU_AND_X: /* A &= X */
                jit->seen |= SEEN_XREG;
                /* nr %r5,%r12 */