netfilter 13/41: ip6_tables: unfold two loops in ip6_packet_match()

Previous thread: netfilter 05/41: ebtables: remove unneeded initializations by Patrick McHardy on Tuesday, March 24, 2009 - 7:03 am. (1 message)

Next thread: netfilter 04/41: x_tables: remove unneeded initializations by Patrick McHardy on Tuesday, March 24, 2009 - 7:03 am. (9 messages)
From: Patrick McHardy
Date: Tuesday, March 24, 2009 - 7:03 am

commit 323dbf96382f057d035afce0237f08e18571ac1d
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Thu Feb 19 11:18:23 2009 +0100

    netfilter: ip6_tables: unfold two loops in ip6_packet_match()
    
    ip6_tables netfilter module can use an ifname_compare() helper
    so that two loops are unfolded.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index a33485d..d64594b 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -89,6 +89,25 @@ ip6t_ext_hdr(u8 nexthdr)
 		 (nexthdr == IPPROTO_DSTOPTS) );
 }
 
+static unsigned long ifname_compare(const char *_a, const char *_b,
+				    const unsigned char *_mask)
+{
+	const unsigned long *a = (const unsigned long *)_a;
+	const unsigned long *b = (const unsigned long *)_b;
+	const unsigned long *mask = (const unsigned long *)_mask;
+	unsigned long ret;
+
+	ret = (a[0] ^ b[0]) & mask[0];
+	if (IFNAMSIZ > sizeof(unsigned long))
+		ret |= (a[1] ^ b[1]) & mask[1];
+	if (IFNAMSIZ > 2 * sizeof(unsigned long))
+		ret |= (a[2] ^ b[2]) & mask[2];
+	if (IFNAMSIZ > 3 * sizeof(unsigned long))
+		ret |= (a[3] ^ b[3]) & mask[3];
+	BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
+	return ret;
+}
+
 /* Returns whether matches rule or not. */
 /* Performance critical - called for every packet */
 static inline bool
@@ -99,7 +118,6 @@ ip6_packet_match(const struct sk_buff *skb,
 		 unsigned int *protoff,
 		 int *fragoff, bool *hotdrop)
 {
-	size_t i;
 	unsigned long ret;
 	const struct ipv6hdr *ipv6 = ipv6_hdr(skb);
 
@@ -120,12 +138,7 @@ ip6_packet_match(const struct sk_buff *skb,
 		return false;
 	}
 
-	/* Look for ifname matches; this should unroll nicely. */
-	for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
-		ret |= (((const unsigned long *)indev)[i]
-			^ ((const unsigned long *)ip6info->iniface)[i])
-			& ((const unsigned ...
Previous thread: netfilter 05/41: ebtables: remove unneeded initializations by Patrick McHardy on Tuesday, March 24, 2009 - 7:03 am. (1 message)

Next thread: netfilter 04/41: x_tables: remove unneeded initializations by Patrick McHardy on Tuesday, March 24, 2009 - 7:03 am. (9 messages)