On Thu, Sep 16, 2010 at 2:18 PM, Patrick McHardy <kaber@xxxxxxxxx> wrote: > On 21.08.2010 00:49, Changli Gao wrote: >> Since we don't change the tuple in the original direction, we can save it >> in ct->tuplehash[IP_CT_DIR_REPLY].hnode.pprev for __nf_conntrack_confirm() >> use. > > I like this idea. We could actually do the same for the reply tuple > and invalidate the saved hash in case the reply tuple is changed > (nf_conntrack_alter_reply()), which only happens when NAT is used. > We can't do that, as the unconfirmed ct owned maybe dropped, and pre-computing will wast CPU cycles in this case. >> __hash_conntrack() is split into two steps: ____hash_conntrack() is used >> to get the raw hash, and __hash_bucket() is used to get the bucket id. > > This patch uses underscores a bit excessively, how about renaming: > > - ____hash_conntrack() => hash_conntrack_raw() > - __hash variables => hash > - hash variables => bucket OK. Thanks. > >> @@ -408,7 +438,8 @@ __nf_conntrack_confirm(struct sk_buff *skb) >> return NF_ACCEPT; >> >> zone = nf_ct_zone(ct); >> - hash = hash_conntrack(net, zone, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); >> + /* reuse the __hash saved before */ >> + hash = hash_bucket(*(unsigned long *)&ct->tuplehash[IP_CT_DIR_REPLY].hnnode.pprev, net); > > Please try to stay at least close to the 80 characters limit. > OK. Thanks. -- Regards, Changli Gao(xiaosuo@xxxxxxxxx) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
