* [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT
@ 2012-11-08 1:28 Daniel Borkmann
2012-11-09 21:39 ` David Miller
2012-11-13 23:00 ` Mircea Gherzan
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Borkmann @ 2012-11-08 1:28 UTC (permalink / raw)
To: linux-arm-kernel
This patch is a follow-up for patch "filter: add XOR instruction for use
with X/K" that implements BPF ARM JIT parts for the BPF XOR operation.
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Cc: Mircea Gherzan <mgherzan@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/net/bpf_jit_32.c | 15 ++++++++++-----
arch/arm/net/bpf_jit_32.h | 2 ++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index c641fb6..8be702d 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -646,6 +646,16 @@ load_ind:
update_on_xread(ctx);
emit(ARM_ORR_R(r_A, r_A, r_X), ctx);
break;
+ case BPF_S_ALU_XOR_K:
+ /* A ^= K; */
+ OP_IMM3(ARM_EOR, r_A, r_A, k, ctx);
+ break;
+ case BPF_S_ANC_ALU_XOR_X:
+ case BPF_S_ALU_XOR_X:
+ /* A ^= X */
+ update_on_xread(ctx);
+ emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
+ break;
case BPF_S_ALU_AND_K:
/* A &= K */
OP_IMM3(ARM_AND, r_A, r_A, k, ctx);
@@ -762,11 +772,6 @@ b_epilogue:
update_on_xread(ctx);
emit(ARM_MOV_R(r_A, r_X), ctx);
break;
- case BPF_S_ANC_ALU_XOR_X:
- /* A ^= X */
- update_on_xread(ctx);
- emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
- break;
case BPF_S_ANC_PROTOCOL:
/* A = ntohs(skb->protocol) */
ctx->seen |= SEEN_SKB;
diff --git a/arch/arm/net/bpf_jit_32.h b/arch/arm/net/bpf_jit_32.h
index 7fa2f7d..afb8462 100644
--- a/arch/arm/net/bpf_jit_32.h
+++ b/arch/arm/net/bpf_jit_32.h
@@ -69,6 +69,7 @@
#define ARM_INST_CMP_I 0x03500000
#define ARM_INST_EOR_R 0x00200000
+#define ARM_INST_EOR_I 0x02200000
#define ARM_INST_LDRB_I 0x05d00000
#define ARM_INST_LDRB_R 0x07d00000
@@ -135,6 +136,7 @@
#define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm)
#define ARM_EOR_R(rd, rn, rm) _AL3_R(ARM_INST_EOR, rd, rn, rm)
+#define ARM_EOR_I(rd, rn, imm) _AL3_I(ARM_INST_EOR, rd, rn, imm)
#define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \
| (off))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT
2012-11-08 1:28 [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT Daniel Borkmann
@ 2012-11-09 21:39 ` David Miller
2012-11-13 23:00 ` Mircea Gherzan
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2012-11-09 21:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Daniel Borkmann <dxchgb@gmail.com>
Date: Thu, 8 Nov 2012 02:28:28 +0100
> This patch is a follow-up for patch "filter: add XOR instruction for use
> with X/K" that implements BPF ARM JIT parts for the BPF XOR operation.
>
> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
> Cc: Mircea Gherzan <mgherzan@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
Could an ARM person please review and ACK these two patches so that
I can toss them into net-next (where the dependency is)?
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT
2012-11-08 1:28 [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT Daniel Borkmann
2012-11-09 21:39 ` David Miller
@ 2012-11-13 23:00 ` Mircea Gherzan
2012-11-13 23:21 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Mircea Gherzan @ 2012-11-13 23:00 UTC (permalink / raw)
To: linux-arm-kernel
Am 08.11.2012 02:28, schrieb Daniel Borkmann:
> This patch is a follow-up for patch "filter: add XOR instruction for use
> with X/K" that implements BPF ARM JIT parts for the BPF XOR operation.
>
> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
> Cc: Mircea Gherzan <mgherzan@gmail.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/net/bpf_jit_32.c | 15 ++++++++++-----
> arch/arm/net/bpf_jit_32.h | 2 ++
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
> index c641fb6..8be702d 100644
> --- a/arch/arm/net/bpf_jit_32.c
> +++ b/arch/arm/net/bpf_jit_32.c
> @@ -646,6 +646,16 @@ load_ind:
> update_on_xread(ctx);
> emit(ARM_ORR_R(r_A, r_A, r_X), ctx);
> break;
> + case BPF_S_ALU_XOR_K:
> + /* A ^= K; */
> + OP_IMM3(ARM_EOR, r_A, r_A, k, ctx);
> + break;
> + case BPF_S_ANC_ALU_XOR_X:
> + case BPF_S_ALU_XOR_X:
> + /* A ^= X */
> + update_on_xread(ctx);
> + emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
> + break;
> case BPF_S_ALU_AND_K:
> /* A &= K */
> OP_IMM3(ARM_AND, r_A, r_A, k, ctx);
> @@ -762,11 +772,6 @@ b_epilogue:
> update_on_xread(ctx);
> emit(ARM_MOV_R(r_A, r_X), ctx);
> break;
> - case BPF_S_ANC_ALU_XOR_X:
> - /* A ^= X */
> - update_on_xread(ctx);
> - emit(ARM_EOR_R(r_A, r_A, r_X), ctx);
> - break;
> case BPF_S_ANC_PROTOCOL:
> /* A = ntohs(skb->protocol) */
> ctx->seen |= SEEN_SKB;
> diff --git a/arch/arm/net/bpf_jit_32.h b/arch/arm/net/bpf_jit_32.h
> index 7fa2f7d..afb8462 100644
> --- a/arch/arm/net/bpf_jit_32.h
> +++ b/arch/arm/net/bpf_jit_32.h
> @@ -69,6 +69,7 @@
> #define ARM_INST_CMP_I 0x03500000
>
> #define ARM_INST_EOR_R 0x00200000
> +#define ARM_INST_EOR_I 0x02200000
>
> #define ARM_INST_LDRB_I 0x05d00000
> #define ARM_INST_LDRB_R 0x07d00000
> @@ -135,6 +136,7 @@
> #define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm)
>
> #define ARM_EOR_R(rd, rn, rm) _AL3_R(ARM_INST_EOR, rd, rn, rm)
> +#define ARM_EOR_I(rd, rn, imm) _AL3_I(ARM_INST_EOR, rd, rn, imm)
>
> #define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \
> | (off))
Acked-by: Mircea Gherzan <mgherzan@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT
2012-11-13 23:00 ` Mircea Gherzan
@ 2012-11-13 23:21 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-11-13 23:21 UTC (permalink / raw)
To: linux-arm-kernel
From: Mircea Gherzan <mgherzan@gmail.com>
Date: Wed, 14 Nov 2012 00:00:04 +0100
> Am 08.11.2012 02:28, schrieb Daniel Borkmann:
>> This patch is a follow-up for patch "filter: add XOR instruction for use
>> with X/K" that implements BPF ARM JIT parts for the BPF XOR operation.
>>
>> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
...
> Acked-by: Mircea Gherzan <mgherzan@gmail.com>
Applied, thanks for reviewing.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-13 23:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-08 1:28 [PATCH net-next 1/2] ARM: net: bpf_jit_32: add XOR instruction for BPF JIT Daniel Borkmann
2012-11-09 21:39 ` David Miller
2012-11-13 23:00 ` Mircea Gherzan
2012-11-13 23:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).