From patchwork Sat Sep 28 08:22:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 278723 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 37D542C050B for ; Sat, 28 Sep 2013 18:24:08 +1000 (EST) Received: from mail-la0-x230.google.com (mail-la0-x230.google.com [IPv6:2a00:1450:4010:c03::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 890E92C010A for ; Sat, 28 Sep 2013 18:23:43 +1000 (EST) Received: by mail-la0-f48.google.com with SMTP id er20so2866682lab.7 for ; Sat, 28 Sep 2013 01:23:39 -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=gr7z6AyMp52ktCCJgzvpHcFDz0BHyClFv0NVPGGWWro=; b=H5xV+jF5NhVSUyswf1fGBE59KT6Z+qRUzrBZ4WWe8fADtY2PRyk6jNhOBOKnU3g0gs 4ZnQdCPAIOZq7/+JQIUhQmbTFpHPWAH9B+1611XN7Pb+bkFQP1HUMqi1mfTbh5yPphBo nZYHXiXYm2KKc7rk8lKlYtkPa8dSWzvFzcUbYOi8uSci/gCkYNDm/YoQGhZzbNz0PhvS f9Q546kUWumAqE/jrzx1hambSsHhR18HdbhDvo3tq0C9e2osJuX3NY2DjQS/CDvo9n6P c4ryFF9iEkTXGcR9l6vzP07Xdv8FYxrX6l5c4l2TaSb5Qogzc8u//8RabHs6aUJzMnR/ P0WQ== X-Received: by 10.112.55.173 with SMTP id t13mr331440lbp.39.1380356619170; Sat, 28 Sep 2013 01:23:39 -0700 (PDT) Received: from localhost ([83.220.239.121]) by mx.google.com with ESMTPSA id mr1sm8486027lbc.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 28 Sep 2013 01:23:38 -0700 (PDT) From: Vladimir Murzin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 2/2] ppc: bpf_jit: support MOD operation Date: Sat, 28 Sep 2013 10:22:01 +0200 Message-Id: <1380356521-3432-2-git-send-email-murzin.v@gmail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1380356521-3432-1-git-send-email-murzin.v@gmail.com> References: <1380356521-3432-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 --- Changelog v1->v2 Definition for r_scratch2 was moved to header file. 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);