linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ben.dooks@codethink.co.uk (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 16/20] ARM: net: fix arm instruction endian-ness in bpf_jit_32.c
Date: Fri, 30 Aug 2013 20:10:52 +0100	[thread overview]
Message-ID: <1377889856-9447-17-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1377889856-9447-1-git-send-email-ben.dooks@codethink.co.uk>

Use <asm/opcodes.h> to correctly transform instruction byte ordering
into in-memory ordering.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
---
 arch/arm/net/bpf_jit_32.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index f50d223..510d923 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -19,6 +19,7 @@
 #include <linux/if_vlan.h>
 #include <asm/cacheflush.h>
 #include <asm/hwcap.h>
+#include <asm/opcodes.h>
 
 #include "bpf_jit_32.h"
 
@@ -113,8 +114,11 @@ static u32 jit_udiv(u32 dividend, u32 divisor)
 
 static inline void _emit(int cond, u32 inst, struct jit_ctx *ctx)
 {
+	inst |= (cond << 28);
+	inst = __opcode_to_mem_arm(inst);
+
 	if (ctx->target != NULL)
-		ctx->target[ctx->idx] = inst | (cond << 28);
+		ctx->target[ctx->idx] = inst;
 
 	ctx->idx++;
 }
-- 
1.7.10.4

  parent reply	other threads:[~2013-08-30 19:10 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30 19:10 big-endian patch series Ben Dooks
2013-08-30 19:10 ` [PATCH 01/20] ARM: fix ARCH_IXP4xx usage of ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-08-30 19:10 ` [PATCH 02/20] ARM: asm: Add ARM_BE8() assembly helper Ben Dooks
2013-08-30 19:10 ` [PATCH 03/20] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8 Ben Dooks
2013-08-30 19:10 ` [PATCH 04/20] ARM: set BE8 if LE in head code Ben Dooks
2013-08-30 19:10 ` [PATCH 05/20] ARM: pl01x debug code endian fix Ben Dooks
2013-08-30 19:10 ` [PATCH 06/20] ARM: twd: data " Ben Dooks
2013-08-30 19:10 ` [PATCH 07/20] ARM: smp_scu: data endian fixes Ben Dooks
2013-08-30 19:10 ` [PATCH 08/20] highbank: enable big-endian Ben Dooks
2013-08-30 21:40   ` Rob Herring
2013-08-31 20:17   ` Sergei Shtylyov
2013-08-30 19:10 ` [PATCH 09/20] mvebu: support running big-endian Ben Dooks
2013-08-30 19:10 ` [PATCH 10/20] vexpress: add big endian support Ben Dooks
2013-08-30 19:10 ` [PATCH 11/20] ARM: alignment: correctly decode instructions in BE8 mode Ben Dooks
2013-08-30 19:10 ` [PATCH 12/20] ARM: traps: use <asm/opcodes.h> to get correct instruction order Ben Dooks
2013-08-30 19:10 ` [PATCH 13/20] ARM: module: correctly relocate instructions in BE8 Ben Dooks
2013-08-30 19:10 ` [PATCH 14/20] ARM: set --be8 when linking modules Ben Dooks
2013-08-30 19:10 ` [PATCH 15/20] ARM: hardware: fix endian-ness in <hardware/coresight.h> Ben Dooks
2013-08-30 19:10 ` Ben Dooks [this message]
2013-08-30 19:10 ` [PATCH 17/20] ARM: Correct BUG() assembly to ensure it is endian-agnostic Ben Dooks
2013-08-30 19:10 ` [PATCH 18/20] ARM: kdgb: use <asm/opcodes.h> for data to be assembled as intruction Ben Dooks
2013-08-30 19:10 ` [PATCH 19/20] ARM: atomic64: fix endian-ness in atomic.h Ben Dooks
2013-08-30 19:10 ` [PATCH 20/20] ARM: signal: sigreturn_codes should be endian neutral to work in BE8 Ben Dooks

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377889856-9447-17-git-send-email-ben.dooks@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).