powerpc: net: filter: fix DIVWU instruction opcode
Subsystems (5)
PATCH RESEND 1/2 powerpc: net: filter: fix DIVWU instruction opcode
Currently DIVWU stands for *signed* divw opcode:
7d 2a 4b 96 divwu r9,r10,r9
7d 2a 4b d6 divw r9,r10,r9
Use the *unsigned* divw opcode for DIVWU.
--- arch/powerpc/include/asm/ppc-opcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/ppc-opcode.h +1 -1
@@ -218,7 +218,7 @@#define PPC_INST_MULLW 0x7c0001d6#define PPC_INST_MULHWU 0x7c000016#define PPC_INST_MULLI 0x1c000000 -#define PPC_INST_DIVWU 0x7c0003d6 +#define PPC_INST_DIVWU 0x7c000396#define PPC_INST_RLWINM 0x54000000#define PPC_INST_RLDICR 0x78000004#define PPC_INST_SLW 0x7c000030
Signature · 1 line
1.7.10.4
PATCH RESEND 2/2 ppc: bpf_jit: support MOD operation
commit b6069a9570 (filter: add MOD operation) added generic support for modulus operation in BPF.
This patch brings JIT support for PPC64
--- arch/powerpc/net/bpf_jit_comp.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/powerpc/net/bpf_jit_comp.c +22 -0
@@ -193,6 +193,28 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,PPC_MUL (r_A, r_A, r_scratch1); }break ; +case BPF_S_ALU_MOD_X :/* A %= X; */ + ctx->seen |=SEEN_XREG ; +PPC_CMPWI (r_X,0 ); +if (ctx->pc_ret0 !=-1 ) { +PPC_BCC (COND_EQ , addrs[ctx->pc_ret0]); + }else { +PPC_BCC_SHORT (COND_NE , (ctx->idx*4 )+12 ); +PPC_LI (r_ret,0 ); +PPC_JMP (exit_addr); + } +PPC_DIVWU (r_scratch1, r_A, r_X); +PPC_MUL (r_scratch1, r_X, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +break ; +case BPF_S_ALU_MOD_K :/* A %= K; */ +#define r_scratch2 (r_scratch1 + 1) +PPC_LI32 (r_scratch2,K ); +PPC_DIVWU (r_scratch1, r_A, r_scratch2); +PPC_MUL (r_scratch1, r_scratch2, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +#undef r_scratch2 +break ;case BPF_S_ALU_DIV_X :/* A /= X; */ ctx->seen |=SEEN_XREG ;PPC_CMPWI (r_X,0 );
Signature · 1 line
1.8.1.5
Re: [RESEND PATCH 2/2] ppc: bpf_jit: support MOD operation
Hi Vladimir,
Quoted 7 lines · Vladimir Murzin
commit
b6069a9570(filter: add MOD operation) added generic support for modulus operation in BPF.
=20
This patch brings JIT support for PPC64
=20Signed-off-by Vladimir Murzin <[email protected]>Acked-by Matt Evans <[email protected]>
Not this version, though; see below.=20
arch/powerpc/net/bpf_jit_co=
Quoted 5 lines
---
arch/powerpc/net/bpf_jit_comp.c| 22 ++++++++++++++++++++++1 file changed, 22 insertions(+)=20
arch/powerpc/net/bpf_jit_co= renamed from arch/powerpc/net/bpf_jit_comp.c +0
-0
mp.c
arch/powerpc/net/bpf_jit_comp.c static int bpf_jit_build_body(struct sk_filter *fp, u=
Quoted 4 lines
index bf56e33..96f24dc 100644
arch/powerpc/net/bpf_jit_comp.c +0
-0@@ -193,6 +193,28 @@ static int bpf_jit_build_body(struct sk_filter *fp, u=
32 *image,
Quoted 9 lines
arch/powerpc/net/bpf_jit_comp.c +6
-0PPC_MUL (r_A, r_A, r_scratch1); }break ; +case BPF_S_ALU_MOD_X :/* A %=3D X; */ + ctx->seen |=3D SEEN_XREG; +PPC_CMPWI (r_X,0 ); +if (ctx->pc_ret0 !=3D -1 ) { +PPC_BCC (COND_EQ , addrs[ctx->pc_ret0]); + }else {
arch/powerpc/net/bpf_jit_comp.c static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, · line 211
Quoted 10 lines
arch/powerpc/net/bpf_jit_comp.c +10
-0+PPC_BCC_SHORT (COND_NE , (ctx->idx*4 )+12 ); +PPC_LI (r_ret,0 ); +PPC_JMP (exit_addr); + } +PPC_DIVWU (r_scratch1, r_A, r_X); +PPC_MUL (r_scratch1, r_X, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +break ; +case BPF_S_ALU_MOD_K :/* A %=3D K; */ +#define r_scratch2 (r_scratch1 + 1)
Old version of this patch, still? I had hoped that r_scratch2 would be defi= ned in the header.
arch/powerpc/net/bpf_jit_comp.c static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, · line 216
Quoted 5 lines
arch/powerpc/net/bpf_jit_comp.c +5
-0+PPC_LI32 (r_scratch2,K ); +PPC_DIVWU (r_scratch1, r_A, r_scratch2); +PPC_MUL (r_scratch1, r_scratch2, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +#undef r_scratch2
And remember this guy too.. :)
Matt
Quoted 6 lines
arch/powerpc/net/bpf_jit_comp.c +1
-1+break ;case BPF_S_ALU_DIV_X :/* A /=3D X; */ ctx->seen |=3D SEEN_XREG;PPC_CMPWI (r_X,0 ); --=201.8.1.5
Vladimir Murzin
Acked-by Matt EvansRe: [RESEND PATCH 2/2] ppc: bpf_jit: support MOD operation
Quoted 36 lines · Matt Evans
Hi Vladimir,
Quoted 7 lines · Vladimir Murzin
commit
b6069a9570(filter: add MOD operation) added generic support for modulus operation in BPF.This patch brings JIT support for PPC64
Signed-off-by Vladimir Murzin <[email protected]>Acked-by Matt Evans <[email protected]>Not this version, though; see below.
Quoted 22 lines
---
arch/powerpc/net/bpf_jit_comp.c| 22 ++++++++++++++++++++++1 file changed, 22 insertions(+)arch/powerpc/net/bpf_jit_comp.c +10
-0@@ -193,6 +193,28 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,PPC_MUL (r_A, r_A, r_scratch1); }break ; +case BPF_S_ALU_MOD_X :/* A %= X; */ + ctx->seen |=SEEN_XREG ; +PPC_CMPWI (r_X,0 ); +if (ctx->pc_ret0 !=-1 ) { +PPC_BCC (COND_EQ , addrs[ctx->pc_ret0]); + }else { +PPC_BCC_SHORT (COND_NE , (ctx->idx*4 )+12 ); +PPC_LI (r_ret,0 ); +PPC_JMP (exit_addr); + }
Quoted 8 lines
arch/powerpc/net/bpf_jit_comp.c static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, · line 211
Quoted 6 lines
arch/powerpc/net/bpf_jit_comp.c +6
-0+PPC_DIVWU (r_scratch1, r_A, r_X); +PPC_MUL (r_scratch1, r_X, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +break ; +case BPF_S_ALU_MOD_K :/* A %= K; */ +#define r_scratch2 (r_scratch1 + 1)Old version of this patch, still? I had hoped that
r_scratch2would be defined in the header.
Oops.. been keeping the old version.. sorry for that, Matt :(
Quoted 8 lines
arch/powerpc/net/bpf_jit_comp.c static int bpf_jit_build_body(struct sk_filter *fp, u32 *image, · line 216
Quoted 6 lines
arch/powerpc/net/bpf_jit_comp.c +5
-0+PPC_LI32 (r_scratch2,K ); +PPC_DIVWU (r_scratch1, r_A, r_scratch2); +PPC_MUL (r_scratch1, r_scratch2, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +#undef r_scratch2And remember this guy too.. :)
I've included the patch below. Nothing is missed this time, I hope ;)
Quoted 10 lines
Matt
Quoted 6 lines
arch/powerpc/net/bpf_jit_comp.c +1
-0+break ;case BPF_S_ALU_DIV_X :/* A /= X; */ ctx->seen |=SEEN_XREG ;PPC_CMPWI (r_X,0 );Signature · 1 line
1.8.1.5
---
From: Vladimir Murzin <[email protected]>
Date: Wed, 28 Aug 2013 01:29:39 +0400
Subject: [PATCH 2/2] ppc: bpf_jit: support MOD operation
commit b6069a9570 (filter: add MOD operation) added generic support for modulus operation in BPF.
This patch brings JIT support for PPC64
--- arch/powerpc/net/bpf_jit.h | 1 + arch/powerpc/net/bpf_jit_comp.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
arch/powerpc/net/bpf_jit.h +1 -0
@@ -39,6 +39,7 @@#define r_X 5#define r_addr 6#define r_scratch1 7 +#define r_scratch2 8#define r_D 14#define r_HL 15#define r_M 16
arch/powerpc/net/bpf_jit_comp.c +20 -0
@@ -193,6 +193,26 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,PPC_MUL (r_A, r_A, r_scratch1); }break ; +case BPF_S_ALU_MOD_X :/* A %= X; */ + ctx->seen |=SEEN_XREG ; +PPC_CMPWI (r_X,0 ); +if (ctx->pc_ret0 !=-1 ) { +PPC_BCC (COND_EQ , addrs[ctx->pc_ret0]); + }else { +PPC_BCC_SHORT (COND_NE , (ctx->idx*4 )+12 ); +PPC_LI (r_ret,0 ); +PPC_JMP (exit_addr); + } +PPC_DIVWU (r_scratch1, r_A, r_X); +PPC_MUL (r_scratch1, r_X, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +break ; +case BPF_S_ALU_MOD_K :/* A %= K; */ +PPC_LI32 (r_scratch2,K ); +PPC_DIVWU (r_scratch1, r_A, r_scratch2); +PPC_MUL (r_scratch1, r_scratch2, r_scratch1); +PPC_SUB (r_A, r_A, r_scratch1); +break ;case BPF_S_ALU_DIV_X :/* A /= X; */ ctx->seen |=SEEN_XREG ;PPC_CMPWI (r_X,0 );
Signature · 1 line
1.8.1.5