Re: [PATCH] net: em_cmp.c use unaligned access helpers

[Harvey Harrison <harvey.harrison@gmail.com>]

On Mon, 2008-06-30 at 01:26 +0200, Thomas Graf wrote:
> * Harvey Harrison <harvey.harrison@gmail.com> 2008-06-29 11:01
> > OK, but be16/32_to_cpu is a no-op on be-arches, so there is a bug here on
> > big-endian machines as they won't switch it back, your simplified patch
> > is actually a bugfix in that case.
> 
> I noticed that my change wouldn't be correct. The point is to allow
> userspace to convert the filter values to big endian once, supply them
> to the kernel and compare big endian values directly. The be16/32_to_cpu
> convertion is available to support greater-than/lesser-than on little
> endian architectures.

Thomas, maybe I'm just being slow, put if it's always a be-value, why
not the following:

From: Harvey Harrison <harvey.harrison@gmail.com>
Subject: [PATCH] net: em_cmp.c use unaligned access helper

ptr pointers to a big endian value, instead of constructing a be
value and conditionally byteswapping on little-endian arches, use
the unaligned to access helpers return a cpu-endian value.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 net/sched/em_cmp.c |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/net/sched/em_cmp.c b/net/sched/em_cmp.c
index cc49c93..6e64af1 100644
--- a/net/sched/em_cmp.c
+++ b/net/sched/em_cmp.c
@@ -14,13 +14,9 @@
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/tc_ematch/tc_em_cmp.h>
+#include <asm/unaligned.h>
 #include <net/pkt_cls.h>
 
-static inline int cmp_needs_transformation(struct tcf_em_cmp *cmp)
-{
-	return unlikely(cmp->flags & TCF_EM_CMP_TRANS);
-}
-
 static int em_cmp_match(struct sk_buff *skb, struct tcf_ematch *em,
 			struct tcf_pkt_info *info)
 {
@@ -37,23 +33,13 @@ static int em_cmp_match(struct sk_buff *skb, struct tcf_ematch *em,
 			break;
 
 		case TCF_EM_ALIGN_U16:
-			val = *ptr << 8;
-			val |= *(ptr+1);
-
-			if (cmp_needs_transformation(cmp))
-				val = be16_to_cpu(val);
+			val = get_unaligned_be16(ptr);
 			break;
 
 		case TCF_EM_ALIGN_U32:
 			/* Worth checking boundries? The branching seems
 			 * to get worse. Visit again. */
-			val = *ptr << 24;
-			val |= *(ptr+1) << 16;
-			val |= *(ptr+2) << 8;
-			val |= *(ptr+3);
-
-			if (cmp_needs_transformation(cmp))
-				val = be32_to_cpu(val);
+			val = get_unaligned_be32(ptr);
 			break;
 
 		default:
-- 
1.5.6.1.322.ge904b