diff options
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 16871da37371..708d60e40066 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c | |||
| @@ -368,14 +368,16 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, | |||
| 368 | EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); | 368 | EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); |
| 369 | /* lhi %r4,0 */ | 369 | /* lhi %r4,0 */ |
| 370 | EMIT4(0xa7480000); | 370 | EMIT4(0xa7480000); |
| 371 | /* dr %r4,%r12 */ | 371 | /* dlr %r4,%r12 */ |
| 372 | EMIT2(0x1d4c); | 372 | EMIT4(0xb997004c); |
| 373 | break; | 373 | break; |
| 374 | case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K) */ | 374 | case BPF_S_ALU_DIV_K: /* A /= K */ |
| 375 | /* m %r4,<d(K)>(%r13) */ | 375 | if (K == 1) |
| 376 | EMIT4_DISP(0x5c40d000, EMIT_CONST(K)); | 376 | break; |
| 377 | /* lr %r5,%r4 */ | 377 | /* lhi %r4,0 */ |
| 378 | EMIT2(0x1854); | 378 | EMIT4(0xa7480000); |
| 379 | /* dl %r4,<d(K)>(%r13) */ | ||
| 380 | EMIT6_DISP(0xe340d000, 0x0097, EMIT_CONST(K)); | ||
| 379 | break; | 381 | break; |
| 380 | case BPF_S_ALU_MOD_X: /* A %= X */ | 382 | case BPF_S_ALU_MOD_X: /* A %= X */ |
| 381 | jit->seen |= SEEN_XREG | SEEN_RET0; | 383 | jit->seen |= SEEN_XREG | SEEN_RET0; |
| @@ -385,16 +387,21 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter, | |||
| 385 | EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); | 387 | EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg)); |
| 386 | /* lhi %r4,0 */ | 388 | /* lhi %r4,0 */ |
| 387 | EMIT4(0xa7480000); | 389 | EMIT4(0xa7480000); |
| 388 | /* dr %r4,%r12 */ | 390 | /* dlr %r4,%r12 */ |
| 389 | EMIT2(0x1d4c); | 391 | EMIT4(0xb997004c); |
| 390 | /* lr %r5,%r4 */ | 392 | /* lr %r5,%r4 */ |
| 391 | EMIT2(0x1854); | 393 | EMIT2(0x1854); |
| 392 | break; | 394 | break; |
| 393 | case BPF_S_ALU_MOD_K: /* A %= K */ | 395 | case BPF_S_ALU_MOD_K: /* A %= K */ |
| 396 | if (K == 1) { | ||
| 397 | /* lhi %r5,0 */ | ||
| 398 | EMIT4(0xa7580000); | ||
| 399 | break; | ||
| 400 | } | ||
| 394 | /* lhi %r4,0 */ | 401 | /* lhi %r4,0 */ |
| 395 | EMIT4(0xa7480000); | 402 | EMIT4(0xa7480000); |
| 396 | /* d %r4,<d(K)>(%r13) */ | 403 | /* dl %r4,<d(K)>(%r13) */ |
| 397 | EMIT4_DISP(0x5d40d000, EMIT_CONST(K)); | 404 | EMIT6_DISP(0xe340d000, 0x0097, EMIT_CONST(K)); |
| 398 | /* lr %r5,%r4 */ | 405 | /* lr %r5,%r4 */ |
| 399 | EMIT2(0x1854); | 406 | EMIT2(0x1854); |
| 400 | break; | 407 | break; |