From patchwork Sun Sep 22 15:35:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 277001 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id B18A52C022A for ; Mon, 23 Sep 2013 01:36:55 +1000 (EST) Received: from mail-la0-x235.google.com (mail-la0-x235.google.com [IPv6:2a00:1450:4010:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 468902C00B9 for ; Mon, 23 Sep 2013 01:36:31 +1000 (EST) Received: by mail-la0-f53.google.com with SMTP id el20so1734105lab.26 for ; Sun, 22 Sep 2013 08:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=iLD1NC9YW8eAgEN8uBg2o9FgDkf7f00VNMX7rQuK5eg=; b=d+wOFtM/5CvpybAsN1fZdKJM5DiRqvs/FndSu1wKhV1p++EIR1I1zb0yBDEGPi1lGL h3stoNWcAgcpu9YdhK8GSSRLUsllPZbi68xFzIGDEmBqid7BXHDTJC59srtr7kXb+z7K wwfoK1gZPvZcUhIJGi0LnWz55o6O31RY4t5jQejubBMaC2qqvlOp+EUrmg12piNndL31 gA8aSLuv2QyD5u9apH2BuHVcdu8xrwzuiqkjO8TUQ4b/k1Qz6aWidnodtLixPSuMxl1E MgJyOIKjr6vl5VHWxabs3u3o+m8h0wdaoh/s/yxRFowiyP28iLbmBu9kScWwy2SPsiLn Au+Q== X-Received: by 10.152.44.225 with SMTP id h1mr16144964lam.15.1379864186646; Sun, 22 Sep 2013 08:36:26 -0700 (PDT) Received: from hp530 ([83.220.236.35]) by mx.google.com with ESMTPSA id kx1sm10522018lac.7.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 22 Sep 2013 08:36:25 -0700 (PDT) Date: Sun, 22 Sep 2013 17:35:46 +0200 From: Vladimir Murzin To: Matt Evans Subject: Re: [RESEND PATCH 2/2] ppc: bpf_jit: support MOD operation Message-ID: <20130922153542.GA2010@hp530> References: <1379748334-3313-1-git-send-email-murzin.v@gmail.com> <1379748334-3313-2-git-send-email-murzin.v@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "netdev@vger.kernel.org" , "dborkman@redhat.com" , "edumazet@google.com" , "paulus@samba.org" , "linuxppc-dev@lists.ozlabs.org" , "davem@davemloft.net" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Mon, Sep 23, 2013 at 01:13:45AM +1000, Matt Evans wrote: > Hi Vladimir, > > On 21 Sep 2013, at 17:25, Vladimir Murzin wrote: > > > 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 > > Acked-by: Matt Evans > > Not this version, though; see below. > > > --- > > arch/powerpc/net/bpf_jit_comp.c | 22 ++++++++++++++++++++++ > > 1 file changed, 22 insertions(+) > > > > diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c > > index bf56e33..96f24dc 100644 > > --- a/arch/powerpc/net/bpf_jit_comp.c > > +++ b/arch/powerpc/net/bpf_jit_comp.c > > @@ -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) > > Old version of this patch, still? I had hoped that r_scratch2 would be defined in the header. Oops.. been keeping the old version.. sorry for that, Matt :( > > > + 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.. :) I've included the patch below. Nothing is missed this time, I hope ;) > > > Matt > > > + break; > > case BPF_S_ALU_DIV_X: /* A /= X; */ > > ctx->seen |= SEEN_XREG; > > PPC_CMPWI(r_X, 0); > > -- > > 1.8.1.5 --- From: Vladimir Murzin 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 Signed-off-by: Vladimir Murzin Acked-by: Matt Evans --- arch/powerpc/net/bpf_jit.h | 1 + arch/powerpc/net/bpf_jit_comp.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h index 8a5dfaf..42a115a 100644 --- a/arch/powerpc/net/bpf_jit.h +++ b/arch/powerpc/net/bpf_jit.h @@ -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 diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index bf56e33..cbb2702 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -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);