From: Eric Dumazet <dada1@cosmosbay•com>
To: Patrick McHardy <kaber@trash•net>
Cc: "David S. Miller" <davem@davemloft•net>,
Netfilter Developers <netfilter-devel@vger•kernel.org>,
Linux Network Development list <netdev@vger•kernel.org>
Subject: [PATCH] netfilter: unfold two critical loops in ip_packet_match()
Date: Thu, 29 Jan 2009 16:31:46 +0100 [thread overview]
Message-ID: <4981CBE2.5020306@cosmosbay.com> (raw)
In-Reply-To: <49809716.3020204@cosmosbay.com>
While doing oprofile tests I noticed two loops are not properly unrolled by gcc
Using a hand coded unrolled loop provides nice speedup : ipt_do_table
credited of 2.52 % of cpu instead of 3.29 % in tbench.
Signed-off-by: Eric Dumazet <dada1@cosmosbay•com>
---
net/ipv4/netfilter/ip_tables.c | 32 +++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index ef8b6ca..7bdb2cf 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -65,6 +65,22 @@ do { \
#define inline
#endif
+static unsigned long ifname_compare(const void *_a, const void *_b, const void *_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];
+ 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];
+ return ret;
+}
+
/*
We keep a set of rules for each CPU, so we can avoid write-locking
them in the softirq when updating the counters and therefore
@@ -83,7 +99,6 @@ ip_packet_match(const struct iphdr *ip,
const struct ipt_ip *ipinfo,
int isfrag)
{
- size_t i;
unsigned long ret;
#define FWINV(bool, invflg) ((bool) ^ !!(ipinfo->invflags & (invflg)))
@@ -103,13 +118,7 @@ ip_packet_match(const struct iphdr *ip,
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 *)ipinfo->iniface)[i])
- & ((const unsigned long *)ipinfo->iniface_mask)[i];
- }
-
+ ret = ifname_compare(indev, ipinfo->iniface, ipinfo->iniface_mask);
if (FWINV(ret != 0, IPT_INV_VIA_IN)) {
dprintf("VIA in mismatch (%s vs %s).%s\n",
indev, ipinfo->iniface,
@@ -117,12 +126,7 @@ ip_packet_match(const struct iphdr *ip,
return false;
}
- for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) {
- ret |= (((const unsigned long *)outdev)[i]
- ^ ((const unsigned long *)ipinfo->outiface)[i])
- & ((const unsigned long *)ipinfo->outiface_mask)[i];
- }
-
+ ret = ifname_compare(outdev, ipinfo->outiface, ipinfo->outiface_mask);
if (FWINV(ret != 0, IPT_INV_VIA_OUT)) {
dprintf("VIA out mismatch (%s vs %s).%s\n",
outdev, ipinfo->outiface,
next prev parent reply other threads:[~2009-01-29 15:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-26 22:15 32 core net-next stack/netfilter "scaling" Rick Jones
2009-01-26 23:10 ` Eric Dumazet
2009-01-26 23:14 ` Stephen Hemminger
2009-01-26 23:19 ` Rick Jones
2009-01-27 9:10 ` Eric Dumazet
2009-01-27 9:15 ` Patrick McHardy
2009-01-27 11:29 ` Eric Dumazet
2009-01-27 11:37 ` Patrick McHardy
2009-01-27 16:23 ` Eric Dumazet
2009-01-27 17:33 ` Patrick McHardy
2009-01-27 18:02 ` Rick Jones
2009-01-27 19:09 ` Rick Jones
2009-01-27 19:24 ` Rick Jones
2009-01-27 22:17 ` Eric Dumazet
2009-01-27 22:29 ` Rick Jones
2009-01-27 22:34 ` Eric Dumazet
2009-01-27 22:43 ` Rick Jones
2009-01-28 13:55 ` Eric Dumazet
2009-01-28 16:25 ` Patrick McHardy
2009-01-28 17:07 ` Eric Dumazet
2009-01-28 17:34 ` Eric Dumazet
2009-01-29 15:31 ` Eric Dumazet [this message]
2009-01-30 15:47 ` [PATCH] netfilter: unfold two critical loops in ip_packet_match() Andi Kleen
2009-01-30 16:54 ` Eric Dumazet
2009-01-30 17:27 ` Andi Kleen
2009-01-30 17:27 ` Eric Dumazet
2009-01-30 17:50 ` Andi Kleen
2009-02-09 13:41 ` Patrick McHardy
2009-02-18 15:10 ` Eric Dumazet
2009-02-18 15:21 ` Patrick McHardy
2009-02-18 16:33 ` Eric Dumazet
2009-02-18 16:52 ` Patrick McHardy
2009-02-18 17:36 ` [PATCH] netfilter: xt_physdev fixes Eric Dumazet
2009-02-18 18:14 ` Patrick McHardy
2009-02-19 8:00 ` [PATCH] netfilter: unfold two loops in physdev_mt() Eric Dumazet
2009-02-19 8:14 ` [PATCH] netfilter: unfold two loops in ip6_packet_match() Eric Dumazet
2009-02-19 10:19 ` Patrick McHardy
2009-02-19 10:17 ` [PATCH] netfilter: unfold two loops in physdev_mt() Patrick McHardy
2009-02-20 10:02 ` [PATCH] netfilter: unfold two critical loops in ip_packet_match() Eric Dumazet
2009-02-20 10:04 ` Patrick McHardy
2009-02-09 14:57 ` 32 core net-next stack/netfilter "scaling" Patrick McHardy
2009-02-10 18:44 ` Stephen Hemminger
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=4981CBE2.5020306@cosmosbay.com \
--to=dada1@cosmosbay$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kaber@trash$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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