bpf: Enable BPF JIT on ppc32
Subsystems (5)
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
All test_bpf tests passed both on 7447a and P2041-based machines.
Changelog:
v1 - > v2: Reordered Kconfig patch in the series
Denis Kirjanov (6):
ppc: bpf: add required compatibility macros for jit
ppc: bpf: add reqired opcodes for ppc32
ppc: bpf: update jit to use compatibility macros
ppc: bpf: rename bpf_jit_64.S to bpf_jit_asm.S
ppc: bpf: Add SKF_AD_CPU for ppc32
ppc: Kconfig: Enable BPF JIT on ppc32
arch/powerpc/include/asm/asm-compat.h | 4 + arch/powerpc/include/asm/ppc-opcode.h | 2 + arch/powerpc/net/Makefile | 2 +- arch/powerpc/net/bpf_jit.h | 64 +++++++++- arch/powerpc/net/bpf_jit_64.S | 229 ---------------------------------- arch/powerpc/net/bpf_jit_asm.S | 229 ++++++++++++++++++++++++++++++++++ arch/powerpc/net/bpf_jit_comp.c | 46 +++---- 7 files changed, 317 insertions(+), 259 deletions(-)
PATCH v2 1/6 ppc: bpf: add required compatibility macros for jit
--- arch/powerpc/include/asm/asm-compat.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/include/asm/asm-compat.h +4 -0
@@ -23,6 +23,8 @@#define PPC_STL stringify_in_c(std)#define PPC_STLU stringify_in_c(stdu)#define PPC_LCMPI stringify_in_c(cmpdi) +#define PPC_LCMPLI stringify_in_c(cmpldi) +#define PPC_LCMP stringify_in_c(cmpd)#define PPC_LONG stringify_in_c(.llong)#define PPC_LONG_ALIGN stringify_in_c(.balign 8)#define PPC_TLNEI stringify_in_c(tdnei)
@@ -52,6 +54,8 @@#define PPC_STL stringify_in_c(stw)#define PPC_STLU stringify_in_c(stwu)#define PPC_LCMPI stringify_in_c(cmpwi) +#define PPC_LCMPLI stringify_in_c(cmplwi) +#define PPC_LCMP stringify_in_c(cmpw)#define PPC_LONG stringify_in_c(.long)#define PPC_LONG_ALIGN stringify_in_c(.balign 4)#define PPC_TLNEI stringify_in_c(twnei)
Signature · 1 line
2.1.3
PATCH v2 2/6 ppc: bpf: add reqired opcodes for ppc32
In reply to Denis Kirjanov--- arch/powerpc/include/asm/ppc-opcode.h | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/include/asm/ppc-opcode.h +2 -0
@@ -212,6 +212,8 @@#define PPC_INST_LWZ 0x80000000#define PPC_INST_STD 0xf8000000#define PPC_INST_STDU 0xf8000001 +#define PPC_INST_STW 0x90000000 +#define PPC_INST_STWU 0x94000000#define PPC_INST_MFLR 0x7c0802a6#define PPC_INST_MTLR 0x7c0803a6#define PPC_INST_CMPWI 0x2c000000
Signature · 1 line
2.1.3
PATCH v2 3/6 ppc: bpf: update jit to use compatibility macros
In reply to Denis KirjanovUse helpers from the asm-compat.h to wrap up assembly mnemonics
--- arch/powerpc/net/bpf_jit.h | 47 ++++++++++++++++++++++++++- arch/powerpc/net/bpf_jit_64.S | 70 ++++++++++++++++++++--------------------- arch/powerpc/net/bpf_jit_comp.c | 32 ++++++++++--------- 3 files changed, 98 insertions(+), 51 deletions(-)
arch/powerpc/net/bpf_jit.h +46 -1
@@ -10,12 +10,25 @@#ifndef _BPF_JIT_H#define _BPF_JIT_H +#ifdef CONFIG_PPC64 +#define BPF_PPC_STACK_R3_OFF 48#define BPF_PPC_STACK_LOCALS 32#define BPF_PPC_STACK_BASIC (48+64)#define BPF_PPC_STACK_SAVE (18*8)#define BPF_PPC_STACKFRAME (BPF_PPC_STACK_BASIC+BPF_PPC_STACK_LOCALS+ \ BPF_PPC_STACK_SAVE)#define BPF_PPC_SLOWPATH_FRAME (48+64) +#else +#define BPF_PPC_STACK_R3_OFF 24 +#define BPF_PPC_STACK_LOCALS 16 +#define BPF_PPC_STACK_BASIC (24+32) +#define BPF_PPC_STACK_SAVE (18*4) +#define BPF_PPC_STACKFRAME (BPF_PPC_STACK_BASIC+BPF_PPC_STACK_LOCALS+ \ + BPF_PPC_STACK_SAVE) +#define BPF_PPC_SLOWPATH_FRAME (24+32) +#endif + +#define REG_SZ (BITS_PER_LONG/8)/* * Generated code register usage:
@@ -57,7 +70,11 @@ DECLARE_LOAD_FUNC(sk_load_half);DECLARE_LOAD_FUNC (sk_load_byte);DECLARE_LOAD_FUNC (sk_load_byte_msh); +#ifdef CONFIG_PPC64 #define FUNCTION_DESCR_SIZE 24 +#else +#define FUNCTION_DESCR_SIZE 0 +#endif /* * 16-bit immediate helper macros: HA() is for use with sign-extending instrs
@@ -86,7 +103,12 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);#define PPC_LIS (r, i) PPC_ADDIS(r, 0, i)#define PPC_STD (r, base, i) EMIT(PPC_INST_STD | ___PPC_RS(r) | \ ___PPC_RA(base) | ((i) & 0xfffc)) - +#define PPC_STDU (r, base, i) EMIT(PPC_INST_STDU | ___PPC_RS(r) | \ + ___PPC_RA(base) | ((i) & 0xfffc)) +#define PPC_STW (r, base, i) EMIT(PPC_INST_STW | ___PPC_RS(r) | \ + ___PPC_RA(base) | ((i) & 0xfffc)) +#define PPC_STWU (r, base, i) EMIT(PPC_INST_STWU | ___PPC_RS(r) | \ + ___PPC_RA(base) | ((i) & 0xfffc))#define PPC_LBZ (r, base, i) EMIT(PPC_INST_LBZ | ___PPC_RT(r) | \ ___PPC_RA(base) | IMM_L(i))
@@ -98,6 +120,17 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh); ___PPC_RA(base) | IMM_L(i))#define PPC_LHBRX (r, base, b) EMIT(PPC_INST_LHBRX | ___PPC_RT(r) | \ ___PPC_RA(base) | ___PPC_RB(b)) + +#ifdef CONFIG_PPC64 +#define PPC_BPF_LL (r, base, i) do { PPC_LD(r, base, i); } while(0) +#define PPC_BPF_STL (r, base, i) do { PPC_STD(r, base, i); } while(0) +#define PPC_BPF_STLU (r, base, i) do { PPC_STDU(r, base, i); } while(0) +#else +#define PPC_BPF_LL (r, base, i) do { PPC_LWZ(r, base, i); } while(0) +#define PPC_BPF_STL (r, base, i) do { PPC_STW(r, base, i); } while(0) +#define PPC_BPF_STLU (r, base, i) do { PPC_STWU(r, base, i); } while(0) +#endif +/* Convenience helpers for the above with 'far' offsets: */ #define PPC_LBZ_OFFS (r, base, i) do { if ((i) < 32768) PPC_LBZ(r, base, i); \ else { PPC_ADDIS(r, base, IMM_HA(i)); \
@@ -115,6 +148,12 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);else {PPC_ADDIS (r, base,IMM_HA (i)); \ PPC_LHZ(r, r, IMM_L(i)); } } while(0) +#ifdef CONFIG_PPC64 +#define PPC_LL_OFFS (r, base, i) do { PPC_LD_OFFS(r, base, i); } while(0) +#else +#define PPC_LL_OFFS (r, base, i) do { PPC_LWZ_OFFS(r, base, i); } while(0) +#endif +#define PPC_CMPWI (a, i) EMIT(PPC_INST_CMPWI | ___PPC_RA(a) | IMM_L(i))#define PPC_CMPDI (a, i) EMIT(PPC_INST_CMPDI | ___PPC_RA(a) | IMM_L(i))#define PPC_CMPLWI (a, i) EMIT(PPC_INST_CMPLWI | ___PPC_RA(a) | IMM_L(i))
@@ -196,6 +235,12 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);PPC_ORI (d, d, (uintptr_t )(i) &0xffff ); \ } }while (0 ); +#ifdef CONFIG_PPC64 +#define PPC_FUNC_ADDR (d,i) do { PPC_LI64(d, i); } while(0) +#else +#define PPC_FUNC_ADDR (d,i) do { PPC_LI32(d, i); } while(0) +#endif +#define PPC_LHBRX_OFFS (r, base, i) \ do { PPC_LI32(r, i); PPC_LHBRX(r, r, base); } while(0)#ifdef __LITTLE_ENDIAN__
arch/powerpc/net/bpf_jit_64.S +35 -35
173 lines not on this page · raw message
arch/powerpc/net/bpf_jit_comp.c +17 -15
@@ -1,8 +1,9 @@ -/* bpf_jit_comp.c: BPF JIT compiler for PPC64 +/* bpf_jit_comp.c: BPF JIT compiler * * Copyright 2011 Matt Evans <[email protected]>, IBM Corporation * * Based on the x86 BPF compiler, by Eric Dumazet ([email protected]) +* Ported to ppc32 by Denis Kirjanov <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
@@ -36,11 +37,11 @@ static void bpf_jit_build_prologue(struct bpf_prog *fp, u32 *image,if (ctx->seen &SEEN_DATAREF ) {/* If we call any helpers (for loads), save LR */ EMIT (PPC_INST_MFLR |__PPC_RT (R0 )); -PPC_STD (0 ,1 ,16 ); +PPC_BPF_STL (0 ,1 ,PPC_LR_STKOFF );/* Back up non-volatile regs. */ -PPC_STD (r_D,1 , -(8 *(32 -r_D))); -PPC_STD (r_HL,1 , -(8 *(32 -r_HL))); +PPC_BPF_STL (r_D,1 , -(REG_SZ *(32 -r_D))); +PPC_BPF_STL (r_HL,1 , -(REG_SZ *(32 -r_HL))); }if (ctx->seen &SEEN_MEM ) {/*
@@ -49,11 +50,10 @@ static void bpf_jit_build_prologue(struct bpf_prog *fp, u32 *image,*/ for (i = r_M; i < (r_M+16 ); i++) {if (ctx->seen & (1 << (i-r_M))) -PPC_STD (i,1 , -(8 *(32 -i))); +PPC_BPF_STL (i,1 , -(REG_SZ *(32 -i))); } } -EMIT (PPC_INST_STDU |__PPC_RS (R1 ) |__PPC_RA (R1 ) | - (-BPF_PPC_STACKFRAME &0xfffc )); +PPC_BPF_STLU (1 ,1 , -BPF_PPC_STACKFRAME ); }if (ctx->seen &SEEN_DATAREF ) {
@@ -67,7 +67,7 @@ static void bpf_jit_build_prologue(struct bpf_prog *fp, u32 *image, data_len));PPC_LWZ_OFFS (r_HL, r_skb, offsetof(struct sk_buff , len));PPC_SUB (r_HL, r_HL, r_scratch1); -PPC_LD_OFFS (r_D, r_skb, offsetof(struct sk_buff , data)); +PPC_LL_OFFS (r_D, r_skb, offsetof(struct sk_buff , data)); }if (ctx->seen &SEEN_XREG ) {
@@ -99,16 +99,16 @@ static void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx)if (ctx->seen & (SEEN_MEM |SEEN_DATAREF )) {PPC_ADDI (1 ,1 ,BPF_PPC_STACKFRAME );if (ctx->seen &SEEN_DATAREF ) { -PPC_LD (0 ,1 ,16 ); +PPC_BPF_LL (0 ,1 ,PPC_LR_STKOFF );PPC_MTLR (0 ); -PPC_LD (r_D,1 , -(8 *(32 -r_D))); -PPC_LD (r_HL,1 , -(8 *(32 -r_HL))); +PPC_BPF_LL (r_D,1 , -(REG_SZ *(32 -r_D))); +PPC_BPF_LL (r_HL,1 , -(REG_SZ *(32 -r_HL))); }if (ctx->seen &SEEN_MEM ) {/* Restore any saved non-vol registers */ for (i = r_M; i < (r_M+16 ); i++) {if (ctx->seen & (1 << (i-r_M))) -PPC_LD (i,1 , -(8 *(32 -i))); +PPC_BPF_LL (i,1 , -(REG_SZ *(32 -i))); } } }
@@ -355,7 +355,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, ifindex) != 4);BUILD_BUG_ON (FIELD_SIZEOF (struct net_device , type) != 2); -PPC_LD_OFFS (r_scratch1, r_skb, offsetof(struct sk_buff , +PPC_LL_OFFS (r_scratch1, r_skb, offsetof(struct sk_buff , dev));PPC_CMPDI (r_scratch1,0 );if (ctx->pc_ret0 !=-1 ) {
@@ -437,7 +437,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, common_load:/* Load from [K]. */ ctx->seen |=SEEN_DATAREF ; -PPC_LI64 (r_scratch1, func); +PPC_FUNC_ADDR (r_scratch1, func);PPC_MTLR (r_scratch1);PPC_LI32 (r_addr,K );PPC_BLRL ();
@@ -463,7 +463,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,* in the helper functions. */ ctx->seen |=SEEN_DATAREF |SEEN_XREG ; -PPC_LI64 (r_scratch1, func); +PPC_FUNC_ADDR (r_scratch1, func);PPC_MTLR (r_scratch1);PPC_ADDI (r_addr, r_X,IMM_L (K ));if (K >=32768 )
@@ -685,9 +685,11 @@ void bpf_jit_compile(struct bpf_prog *fp)if (image) {bpf_flush_icache (code_base, code_base + (proglen/4 )); +#ifdef CONFIG_PPC64 /* Function descriptor nastiness: Address + TOC */ ((u64 *)image)[0 ] = (u64 )code_base; ((u64 *)image)[1 ] = local_paca->kernel_toc; +#endif fp->bpf_func = (void *)image; fp->jited = true; }
Signature · 1 line
2.1.3
PATCH v2 4/6 ppc: bpf: rename bpf_jit_64.S to bpf_jit_asm.S
In reply to Denis Kirjanov---
arch/powerpc/net/Makefile | 2 +-
arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (100%)arch/powerpc/net/Makefile +1 -1
@@ -1,4 +1,4 @@ # # Arch-specific network modules # -obj-$(CONFIG_BPF_JIT) += bpf_jit_64.o bpf_jit_comp.o +obj-$(CONFIG_BPF_JIT) += bpf_jit_asm.o bpf_jit_comp.o
arch/powerpc/net/bpf_jit_asm.S renamed from arch/powerpc/net/bpf_jit_64.S +0 -0
Signature · 1 line
2.1.3
PATCH v2 5/6 ppc: bpf: Add SKF_AD_CPU for ppc32
In reply to Denis Kirjanov--- arch/powerpc/net/bpf_jit.h | 17 +++++++++++++++++ arch/powerpc/net/bpf_jit_comp.c | 14 +------------- 2 files changed, 18 insertions(+), 13 deletions(-)
arch/powerpc/net/bpf_jit.h +17 -0
@@ -154,6 +154,23 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh);#define PPC_LL_OFFS (r, base, i) do { PPC_LWZ_OFFS(r, base, i); } while(0)#endif +#ifdef CONFIG_SMP +#ifdef CONFIG_PPC64 +#define PPC_BPF_LOAD_CPU (r) \ + do { BUILD_BUG_ON(FIELD_SIZEOF(struct paca_struct, paca_index) != 2); \ + PPC_LHZ_OFFS(r, 13, offsetof(struct paca_struct, paca_index)); \ + } while (0) +#else +#define PPC_BPF_LOAD_CPU (r) \ + do { BUILD_BUG_ON(FIELD_SIZEOF(struct thread_info, cpu) != 4); \ + PPC_LHZ_OFFS(r, (1 & ~(THREAD_SIZE - 1)), \ + offsetof(struct thread_info, cpu)); \ + } while(0) +#endif +#else +#define PPC_BPF_LOAD_CPU (r) do { PPC_LI(r, 0); } while(0) +#endif +#define PPC_CMPWI (a, i) EMIT(PPC_INST_CMPWI | ___PPC_RA(a) | IMM_L(i))#define PPC_CMPDI (a, i) EMIT(PPC_INST_CMPDI | ___PPC_RA(a) | IMM_L(i))#define PPC_CMPLWI (a, i) EMIT(PPC_INST_CMPLWI | ___PPC_RA(a) | IMM_L(i))
arch/powerpc/net/bpf_jit_comp.c +1 -13
@@ -411,20 +411,8 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,PPC_SRWI (r_A, r_A,5 );break ;case BPF_ANC |SKF_AD_CPU : -#ifdef CONFIG_SMP -/* -* PACA ptr is r13: -* raw_smp_processor_id() = local_paca->paca_index -*/ -BUILD_BUG_ON (FIELD_SIZEOF (struct paca_struct , - paca_index) != 2); -PPC_LHZ_OFFS (r_A,13 , - offsetof(struct paca_struct , paca_index)); -#else -PPC_LI (r_A,0 ); -#endif +PPC_BPF_LOAD_CPU (r_A);break ; -/*** Absolute loads from packet header/data ***/ case BPF_LD |BPF_W |BPF_ABS : func =CHOOSE_LOAD_FUNC (K , sk_load_word);
Signature · 1 line
2.1.3
PATCH v2 6/6 ppc: Kconfig: Enable BPF JIT on ppc32
In reply to Denis Kirjanov--- arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig +1 -1
@@ -126,7 +126,7 @@ config PPC select IRQ_FORCED_THREADING select HAVE_RCU_TABLE_FREE if SMP select HAVE_SYSCALL_TRACEPOINTS - select HAVE_BPF_JIT if PPC64 + select HAVE_BPF_JIT select HAVE_ARCH_JUMP_LABEL select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_HAS_GCOV_PROFILE_ALL
Signature · 1 line
2.1.3
David Miller
maintainerFrom: Denis Kirjanov <[email protected]>
Date: Tue, 17 Feb 2015 10:04:37 +0300
Quoted 7 lines
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
All
test_bpftests passed both on 7447a and P2041-based machines.Changelog:
v1 - > v2: ReorderedKconfigpatch in the series
Who plans to take this series? A PowerPC maintainer?
If not, should I take it?
Quoted 6 lines · David Miller
From: Denis Kirjanov <[email protected]>
Date: Tue, 17 Feb 2015 10:04:37 +0300Quoted 3 lines
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
Quoted 9 lines
Quoted 4 lines
All
test_bpftests passed both on 7447a and P2041-based machines.Changelog:
v1 - > v2: ReorderedKconfigpatch in the seriesWho plans to take this series? A PowerPC maintainer?
If not, should I take it?
I think that it should go through your tree...
Michael Ellerman
reviewerQuoted 9 lines · Denis Kirjanov
Quoted 8 lines · David Miller
From: Denis Kirjanov <[email protected]>
Date: Tue, 17 Feb 2015 10:04:37 +0300Quoted 5 lines
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
All
test_bpftests passed both on 7447a and P2041-based machines.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Changelog:
v1 - > v2: ReorderedKconfigpatch in the seriesWho plans to take this series? A PowerPC maintainer?
If not, should I take it?
I think that it should go through your tree...
I'm happy for Dave to take it.
But did you test 64-bit as well?
cheers
Quoted 15 lines · Michael Ellerman
Quoted 14 lines · Denis Kirjanov
Quoted 13 lines · David Miller
From: Denis Kirjanov <[email protected]>
Date: Tue, 17 Feb 2015 10:04:37 +0300Quoted 7 lines
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
All
test_bpftests passed both on 7447a and P2041-based machines.Changelog:
v1 - > v2: ReorderedKconfigpatch in the seriesWho plans to take this series? A PowerPC maintainer?
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
If not, should I take it?
I think that it should go through your tree...
I'm happy for Dave to take it.
But did you test 64-bit as well?
Sure!
Quoted 4 lines
cheers
David Miller
maintaineraFrom: Denis Kirjanov <[email protected]>
Date: Tue, 17 Feb 2015 10:04:37 +0300
Quoted 7 lines
This patch series enables BPF JIT on ppc32. There are relatevily few chnages in the code to make it work.
All
test_bpftests passed both on 7447a and P2041-based machines.Changelog:
v1 - > v2: ReorderedKconfigpatch in the series
Series applied to net-next, thanks.