From patchwork Sat Sep 21 07:25:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 276847 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 E3F7C2C0239 for ; Sat, 21 Sep 2013 17:28:14 +1000 (EST) Received: from mail-la0-x236.google.com (mail-la0-x236.google.com [IPv6:2a00:1450:4010:c03::236]) (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 9E4662C01B9 for ; Sat, 21 Sep 2013 17:27:46 +1000 (EST) Received: by mail-la0-f54.google.com with SMTP id ea20so1051621lab.41 for ; Sat, 21 Sep 2013 00:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aLerWhoaMtwEId9YfQMpEtkNytBLuvxyCZSIqJmLfIY=; b=nudRWbKSw3Jc9LGwceEYUECyfJwF7twHRKuDy8JzUghAaPxY1BXMM9lSHSBpLMAPPn 5z9hUbH4whDDHOvvwHWn7daJe1GebUyz6wbMOLKDaEyhXk4zFnVLL42PwGPO+bj0iug4 Af5dSw9IZNgVEISSeVv+6EfbT2BxLBH4l3+ECpR8cZi/qPH54QYiMFqgMJfP9avS38VQ pcH0mUPX+virEYfHqbZ9w+XQIWutUgii9+7g2ge97EiHpV9GxepkBAGvPejq7/G8Uj0u kRtz9Dn+JVmsg0fuLrlwI+2RCnaVSEKjRe71bOTRKthuBAszP8d8zBQGc8UUT9ipfktc QHtQ== X-Received: by 10.112.181.100 with SMTP id dv4mr10382lbc.34.1379748462009; Sat, 21 Sep 2013 00:27:42 -0700 (PDT) Received: from localhost ([83.220.237.243]) by mx.google.com with ESMTPSA id pw4sm7540746lbb.9.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 21 Sep 2013 00:27:41 -0700 (PDT) From: Vladimir Murzin To: linuxppc-dev@lists.ozlabs.org Subject: [RESEND PATCH 2/2] ppc: bpf_jit: support MOD operation Date: Sat, 21 Sep 2013 09:25:34 +0200 Message-Id: <1379748334-3313-2-git-send-email-murzin.v@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1379748334-3313-1-git-send-email-murzin.v@gmail.com> References: <1379748334-3313-1-git-send-email-murzin.v@gmail.com> Cc: matt@ozlabs.org, netdev@vger.kernel.org, Vladimir Murzin , dborkman@redhat.com, edumazet@google.com, paulus@samba.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: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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_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) + 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 + break; case BPF_S_ALU_DIV_X: /* A /= X; */ ctx->seen |= SEEN_XREG; PPC_CMPWI(r_X, 0);