netfilter NAT optimization
Subsystems (2)
PATCH 1/1 netfilter NAT optimization
Hi Dave!
The following patch against 2.6.0-test4 (courtesy of Patrick McHardy) optimizes the NAT code. In the old implementation, the hash function was passed to the LIST_DELETE macro, which resulted in it being called two times instead of one.
This patch also applies to 2.4.x - but I think we should wait for 2.4.23-preX to come up first. Do you want me to re-submit it for 2.4.23-preX, once it shows up?
Pleaes apply,
net/ipv4/netfilter/ip_nat_core.c +16 -17
@@ -67,6 +67,7 @@static void ip_nat_cleanup_conntrack (struct ip_conntrack *conn) {struct ip_nat_info *info = &conn->nat.info; +unsigned int hs, hp;if (!info->initialized)return ;
@@ -74,21 +75,18 @@IP_NF_ASSERT (info->bysource.conntrack);IP_NF_ASSERT (info->byipsproto.conntrack); + hs =hash_by_src (&conn->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src, + conn->tuplehash[IP_CT_DIR_ORIGINAL ] + .tuple.dst.protonum); + + hp =hash_by_ipsproto (conn->tuplehash[IP_CT_DIR_REPLY ].tuple.src.ip, + conn->tuplehash[IP_CT_DIR_REPLY ].tuple.dst.ip, + conn->tuplehash[IP_CT_DIR_REPLY ] + .tuple.dst.protonum); +WRITE_LOCK (&ip_nat_lock); -LIST_DELETE (&bysource[hash_by_src (&conn->tuplehash[IP_CT_DIR_ORIGINAL ] - .tuple.src, - conn->tuplehash[IP_CT_DIR_ORIGINAL ] - .tuple.dst.protonum)], - &info->bysource); - -LIST_DELETE (&byipsproto - [hash_by_ipsproto (conn->tuplehash[IP_CT_DIR_REPLY ] - .tuple.src.ip, - conn->tuplehash[IP_CT_DIR_REPLY ] - .tuple.dst.ip, - conn->tuplehash[IP_CT_DIR_REPLY ] - .tuple.dst.protonum)], - &info->byipsproto); +LIST_DELETE (&bysource[hs], &info->bysource); +LIST_DELETE (&byipsproto[hp], &info->byipsproto);WRITE_UNLOCK (&ip_nat_lock); }
@@ -244,11 +242,12 @@ const struct ip_conntrack *conntrack) {unsigned int score =0 ; +unsigned int h;MUST_BE_READ_LOCKED (&ip_nat_lock); -LIST_FIND (&byipsproto[hash_by_ipsproto (src, dst, protonum)], - fake_cmp, struct ip_nat_hash *, src, dst, protonum, &score, - conntrack); + h =hash_by_ipsproto (src, dst, protonum); + LIST_FIND(&byipsproto[h], fake_cmp, struct ip_nat_hash *, + src, dst, protonum, &score, conntrack);return score; }
Signature · 5 lines
- Harald Welte <[email protected]> http://www.netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie
David S. Miller
AppliedQuoted 4 lines · On Sun, 24 Aug 2003 10:56:00 +0200 Harald Welte <[email protected]> wrote:
The following patch against 2.6.0-test4 (courtesy of Patrick McHardy) optimizes the NAT code. In the old implementation, the hash function was passed to the
LIST_DELETEmacro, which resulted in it being called two times instead of one.
Applied to 2.6.x, thanks.
Quoted 3 lines
This patch also applies to 2.4.x - but I think we should wait for 2.4.23-preX to come up first. Do you want me to re-submit it for 2.4.23-preX, once it shows up?
I also put this into my 2.4.23-preX tree, don't worry about it. :-)