From patchwork Tue Aug 27 22:52:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 2850273 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C5269F271 for ; Tue, 27 Aug 2013 18:53:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82B9B204C7 for ; Tue, 27 Aug 2013 18:53:42 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37555204C4 for ; Tue, 27 Aug 2013 18:53:41 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEOOT-0008OP-FG; Tue, 27 Aug 2013 18:53:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEOOR-0002Vx-6s; Tue, 27 Aug 2013 18:53:31 +0000 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEOON-0002Vf-Qy for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2013 18:53:28 +0000 Received: by mail-la0-f52.google.com with SMTP id ev20so3847783lab.39 for ; Tue, 27 Aug 2013 11:53:05 -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; bh=rOryuNrg/HqtfRNmgYvq9mx8tp0qQFzF1UT3sr9PVhs=; b=eL9+aumQUFdRu/fubkgqhB0BFTEe6P27MBOKwmMigpDDE9C3Y69w+OQBaiCRWPlBnQ YWhAYZCKC3j2GwWMa/qV89nlbff1x8GV87VpJeOUJjORjxAvor40ukOoXNqJ3OUkhXPZ 6kt9LhkycOfm6NeOZFRZ+OCSEEh8zNtG3SxkW3lcoEQqYOXaAzCNx9VV4QN9cyYYSV3n d2kvtQU9U9aXLsJ7+MaWPgvb8fzzdWEPKktSNvTbtrEMH3qyd2qZx/gYwzvKfyXHJpyS 8gEE7I/KOQVZ5zlKF0ZW16BkGN8hK7XpToMcRKMhNEGMAMYypArDILS9ArxiWs8Gt0mR ia2g== X-Received: by 10.152.2.4 with SMTP id 4mr19905558laq.0.1377629585410; Tue, 27 Aug 2013 11:53:05 -0700 (PDT) Received: from localhost.localdomain ([83.220.236.96]) by mx.google.com with ESMTPSA id u18sm7738801lbp.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 27 Aug 2013 11:53:05 -0700 (PDT) From: Vladimir Murzin To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: bpf_jit: support MOD operation Date: Wed, 28 Aug 2013 02:52:32 +0400 Message-Id: <1377643952-10388-1-git-send-email-murzin.v@gmail.com> X-Mailer: git-send-email 1.8.1.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130827_145328_085858_FB9F5AEB X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.0 (+) Cc: mgherzan@gmail.com, dborkman@redhat.com, linux@arm.linux.org.uk, davem@davemloft.net, Vladimir Murzin X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_03_06, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit b6069a9570 (filter: add MOD operation) added generic support for modulus operation in BPF. This patch brings JIT support for ARM. Signed-off-by: Vladimir Murzin --- arch/arm/net/bpf_jit_32.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index f50d223..0bfff55 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -636,6 +636,24 @@ load_ind: update_on_xread(ctx); emit(ARM_MUL(r_A, r_A, r_X), ctx); break; + case BPF_S_ALU_MOD_X: /* A %= X; */ + update_on_xread(ctx); + emit(ARM_CMP_I(r_X, 0), ctx); + emit_err_ret(ARM_COND_EQ, ctx); + emit_udiv(r_scratch, r_A, r_X, ctx); + emit(ARM_MUL(r_scratch, r_X, r_scratch), ctx); + emit(ARM_SUB_R(r_A, r_A, r_scratch), ctx); + break; + case BPF_S_ALU_MOD_K: /* A %= K; */ + /* + * reuse ARM_R1 as the temp register - it should be safe + * as soon as udiv may touch it too. + */ + emit_mov_i(ARM_R1, k, ctx); + emit_udiv(r_scratch, r_A, ARM_R1, ctx); + emit(ARM_MUL(r_scratch, ARM_R1, r_scratch), ctx); + emit(ARM_SUB_R(r_A, r_A, r_scratch), ctx); + break; case BPF_S_ALU_DIV_K: /* current k == reciprocal_value(userspace k) */ emit_mov_i(r_scratch, k, ctx);