From patchwork Thu Jun 7 15:40:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mircea Gherzan X-Patchwork-Id: 163645 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C6828B6F86 for ; Fri, 8 Jun 2012 01:41:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754053Ab2FGPlI (ORCPT ); Thu, 7 Jun 2012 11:41:08 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:33746 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751886Ab2FGPlG (ORCPT ); Thu, 7 Jun 2012 11:41:06 -0400 Received: by bkcji2 with SMTP id ji2so698804bkc.19 for ; Thu, 07 Jun 2012 08:41:04 -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:x-mailer; bh=JoM8XIDe/GzUzeWQpQBTOvKdUxQ4sKPYZa6xDP5zVs8=; b=JlqpVSXddeJQE42uRi0ivuFCRIDgVt47KT3ImN6pHx4zfJsxUKJTK5uc43CA+HK2JS 2u0x/8xfGsyybGtgAWDi/URGgXUv8Pn2dnz/7qIYVhZrZpdnNlC9wcUsQ+xDo6whkGEL oMYBMPqUgJlGSbmuBCTDNKIJQ4oZTj0J7XUY98VRTJqKrS8dORk1GDMUQ+DEAsydivhC RMUmosqN+02T14IIvCFQeSckwJh0uKnEYrB/BF7hfH/3vNEDrS1V1vXjZJjCvdbC6qYj hUg81uMlcYh5csUFY7JALqDZ87Sf4ZmwBXDb9VeEwNX3aeHaRHdNJLB/t6vYCh9NMBxq NqzA== Received: by 10.204.153.21 with SMTP id i21mr1889282bkw.38.1339083664709; Thu, 07 Jun 2012 08:41:04 -0700 (PDT) Received: from beast3.hitronhub.home (178-26-146-52-dynip.superkabel.de. [178.26.146.52]) by mx.google.com with ESMTPS id n17sm4367224bkw.5.2012.06.07.08.41.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Jun 2012 08:41:02 -0700 (PDT) From: Mircea Gherzan To: linux@arm.linux.org.uk Cc: mgherzan@gmail.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, davem@davemloft.net Subject: [PATCH] ARM: bpf_jit: BPF_S_ANC_ALU_XOR_X support Date: Thu, 7 Jun 2012 17:40:18 +0200 Message-Id: <1339083618-15009-1-git-send-email-mgherzan@gmail.com> X-Mailer: git-send-email 1.7.10 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org JIT support for the XOR operation introduced by the commit ffe06c17afbb. Signed-off-by: Mircea Gherzan --- arch/arm/net/bpf_jit_32.c | 5 +++++ arch/arm/net/bpf_jit_32.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 62135849..c641fb6 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -762,6 +762,11 @@ b_epilogue: update_on_xread(ctx); emit(ARM_MOV_R(r_A, r_X), ctx); break; + case BPF_S_ANC_ALU_XOR_X: + /* A ^= X */ + update_on_xread(ctx); + emit(ARM_EOR_R(r_A, r_A, r_X), ctx); + break; case BPF_S_ANC_PROTOCOL: /* A = ntohs(skb->protocol) */ ctx->seen |= SEEN_SKB; diff --git a/arch/arm/net/bpf_jit_32.h b/arch/arm/net/bpf_jit_32.h index 99ae5e3..7fa2f7d 100644 --- a/arch/arm/net/bpf_jit_32.h +++ b/arch/arm/net/bpf_jit_32.h @@ -68,6 +68,8 @@ #define ARM_INST_CMP_R 0x01500000 #define ARM_INST_CMP_I 0x03500000 +#define ARM_INST_EOR_R 0x00200000 + #define ARM_INST_LDRB_I 0x05d00000 #define ARM_INST_LDRB_R 0x07d00000 #define ARM_INST_LDRH_I 0x01d000b0 @@ -132,6 +134,8 @@ #define ARM_CMP_R(rn, rm) _AL3_R(ARM_INST_CMP, 0, rn, rm) #define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm) +#define ARM_EOR_R(rd, rn, rm) _AL3_R(ARM_INST_EOR, rd, rn, rm) + #define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \ | (off)) #define ARM_LDRB_I(rt, rn, off) (ARM_INST_LDRB_I | (rt) << 12 | (rn) << 16 \