diff options
| author | Alexei Starovoitov | 2018-01-27 01:42:07 +0100 |
|---|---|---|
| committer | Alexei Starovoitov | 2018-01-27 01:42:08 +0100 |
| commit | 1651e39e4a1adacd24e953aae46ba9b66d996035 (patch) | |
| tree | 7294f8492555ec8d65ee23534f38c62d0e6029d5 /arch/arm/net | |
| parent | samples/bpf: Partially fixes the bpf.o build (diff) | |
| parent | bpf: add further test cases around div/mod and others (diff) | |
| download | kernel-qcow2-linux-1651e39e4a1adacd24e953aae46ba9b66d996035.tar.gz kernel-qcow2-linux-1651e39e4a1adacd24e953aae46ba9b66d996035.tar.xz kernel-qcow2-linux-1651e39e4a1adacd24e953aae46ba9b66d996035.zip | |
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: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'arch/arm/net')
| -rw-r--r-- | arch/arm/net/bpf_jit_32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 41e2feb0cf4f..b5030e1a41d8 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -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) |