* [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction
@ 2014-11-06 6:02 Denis Kirjanov
2014-11-07 19:50 ` David Miller
2014-11-08 17:59 ` Alexei Starovoitov
0 siblings, 2 replies; 3+ messages in thread
From: Denis Kirjanov @ 2014-11-06 6:02 UTC (permalink / raw)
To: netdev
Cc: Philippe Bergheaud, linuxppc-dev, Denis Kirjanov, Daniel Borkmann,
Alexei Starovoitov
Add BPF extension SKF_AD_HATYPE to ppc JIT to check
the hw type of the interface
JIT off:
[ 69.106783] test_bpf: #20 LD_HATYPE 48 48 PASS
JIT on:
[ 64.721757] test_bpf: #20 LD_HATYPE 7 6 PASS
CC: Alexei Starovoitov<alexei.starovoitov@gmail.com>
CC: Daniel Borkmann<dborkman@redhat.com>
CC: Philippe Bergheaud<felix@linux.vnet.ibm.com>
Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
---
arch/powerpc/net/bpf_jit_comp.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index d110e28..8bf4fc2 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -412,6 +412,22 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
PPC_ANDI(r_A, r_A, PKT_TYPE_MAX);
PPC_SRWI(r_A, r_A, 5);
break;
+ case BPF_ANC | SKF_AD_HATYPE:
+ BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2);
+ PPC_LD_OFFS(r_scratch1, r_skb, offsetof(struct sk_buff,
+ dev));
+ PPC_CMPDI(r_scratch1, 0);
+ if (ctx->pc_ret0 != -1) {
+ PPC_BCC(COND_EQ, addrs[ctx->pc_ret0]);
+ } else {
+ /* Exit, returning 0; first pass hits here. */
+ PPC_BCC_SHORT(COND_NE, (ctx->idx*4)+12);
+ PPC_LI(r_ret, 0);
+ PPC_JMP(exit_addr);
+ }
+ PPC_LHZ_OFFS(r_A, r_scratch1,
+ offsetof(struct net_device, type));
+ break;
case BPF_ANC | SKF_AD_CPU:
#ifdef CONFIG_SMP
/*
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction
2014-11-06 6:02 [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction Denis Kirjanov
@ 2014-11-07 19:50 ` David Miller
2014-11-08 17:59 ` Alexei Starovoitov
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-11-07 19:50 UTC (permalink / raw)
To: kda; +Cc: felix, netdev, dborkman, alexei.starovoitov, linuxppc-dev
From: Denis Kirjanov <kda@linux-powerpc.org>
Date: Thu, 6 Nov 2014 09:02:35 +0300
> Add BPF extension SKF_AD_HATYPE to ppc JIT to check
> the hw type of the interface
>
> JIT off:
> [ 69.106783] test_bpf: #20 LD_HATYPE 48 48 PASS
> JIT on:
> [ 64.721757] test_bpf: #20 LD_HATYPE 7 6 PASS
>
> CC: Alexei Starovoitov<alexei.starovoitov@gmail.com>
> CC: Daniel Borkmann<dborkman@redhat.com>
> CC: Philippe Bergheaud<felix@linux.vnet.ibm.com>
> Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
Can I get some reviews please?
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction
2014-11-06 6:02 [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction Denis Kirjanov
2014-11-07 19:50 ` David Miller
@ 2014-11-08 17:59 ` Alexei Starovoitov
1 sibling, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2014-11-08 17:59 UTC (permalink / raw)
To: Denis Kirjanov
Cc: Philippe Bergheaud, netdev@vger.kernel.org, Daniel Borkmann,
linuxppc-dev
On Wed, Nov 5, 2014 at 10:02 PM, Denis Kirjanov <kda@linux-powerpc.org> wrote:
> Add BPF extension SKF_AD_HATYPE to ppc JIT to check
> the hw type of the interface
>
> JIT off:
> [ 69.106783] test_bpf: #20 LD_HATYPE 48 48 PASS
> JIT on:
> [ 64.721757] test_bpf: #20 LD_HATYPE 7 6 PASS
>
> CC: Alexei Starovoitov<alexei.starovoitov@gmail.com>
> CC: Daniel Borkmann<dborkman@redhat.com>
> CC: Philippe Bergheaud<felix@linux.vnet.ibm.com>
> Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
> ---
> arch/powerpc/net/bpf_jit_comp.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
> index d110e28..8bf4fc2 100644
> --- a/arch/powerpc/net/bpf_jit_comp.c
> +++ b/arch/powerpc/net/bpf_jit_comp.c
> @@ -412,6 +412,22 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
> PPC_ANDI(r_A, r_A, PKT_TYPE_MAX);
> PPC_SRWI(r_A, r_A, 5);
> break;
> + case BPF_ANC | SKF_AD_HATYPE:
> + BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2);
> + PPC_LD_OFFS(r_scratch1, r_skb, offsetof(struct sk_buff,
> + dev));
> + PPC_CMPDI(r_scratch1, 0);
> + if (ctx->pc_ret0 != -1) {
> + PPC_BCC(COND_EQ, addrs[ctx->pc_ret0]);
> + } else {
> + /* Exit, returning 0; first pass hits here. */
> + PPC_BCC_SHORT(COND_NE, (ctx->idx*4)+12);
please use canonical formatting ctx->idx * 4 + 12
> + PPC_LI(r_ret, 0);
> + PPC_JMP(exit_addr);
> + }
> + PPC_LHZ_OFFS(r_A, r_scratch1,
> + offsetof(struct net_device, type));
the whole thing looks like copy paste from 'case ifindex'.
Would be nice to handle them together to reduce
duplicated code, sine only last load is different.
Also in commit log please do _both_ runs with JIT on.
You should see a difference before/after applying this patch.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-08 17:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-06 6:02 [PATCH net-next] PPC: bpf_jit_comp: add SKF_AD_HATYPE instruction Denis Kirjanov
2014-11-07 19:50 ` David Miller
2014-11-08 17:59 ` Alexei Starovoitov
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).