Skip to contentSkip to conversation

ARM: net: bpf_jit_32: add XOR instruction for BPF JIT

PATCH Applied Daniel Borkmann 3 participants 4 messages Nov 8, 2012 – Nov 13, 2012

Subsystems (5)
Networking Network drivers Arm (32-bit) BPF +1 more subsystems
lore
Share & tools
lore

Daniel Borkmann

author
#0 lore raw

PATCH 1/2 ARM: net: bpf_jit_32: add XOR instruction for BPF JIT

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 <[email protected]>
Cc Mircea Gherzan <[email protected]>
Cc Arnd Bergmann <[email protected]>
---
 arch/arm/net/bpf_jit_32.c |   15 ++++++++++-----
 arch/arm/net/bpf_jit_32.h |    2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)
arch/arm/net/bpf_jit_32.c +10 -5
index c641fb6..8be702d 100644
@@ -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;
arch/arm/net/bpf_jit_32.h +2 -0
index 7fa2f7d..afb8462 100644
@@ -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))
maintainer
#1 lore raw

From: Daniel Borkmann <[email protected]>
Date: Thu, 8 Nov 2012 02:28:28 +0100

Quoted 6 lines

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 <[email protected]>
Cc Mircea Gherzan <[email protected]>
Cc Arnd Bergmann <[email protected]>

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!

Acked-by on v1 1/2
#2 lore raw
In reply to Daniel Borkmann

Am 08.11.2012 02:28, schrieb Daniel Borkmann:

Quoted 57 lines

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 <[email protected]>
Cc Mircea Gherzan <[email protected]>
Cc Arnd Bergmann <[email protected]>
---
 arch/arm/net/bpf_jit_32.c |   15 ++++++++++-----
 arch/arm/net/bpf_jit_32.h |    2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)
arch/arm/net/bpf_jit_32.c +10 -5
index c641fb6..8be702d 100644
@@ -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;
arch/arm/net/bpf_jit_32.h +1 -0
index 7fa2f7d..afb8462 100644
@@ -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

arch/arm/net/bpf_jit_32.h line 142

Quoted 7 lines
arch/arm/net/bpf_jit_32.h +1 -0
@@ -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 <[email protected]>
maintainer Applied
#3 lore raw

From: Mircea Gherzan <[email protected]>
Date: Wed, 14 Nov 2012 00:00:04 +0100

Quoted 5 lines

Am 08.11.2012 02:28, schrieb Daniel Borkmann:

Quoted 4 lines

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 <[email protected]>

...

Quoted 1 line
Acked-by Mircea Gherzan <[email protected]>

Applied, thanks for reviewing.