On Tue, Jul 05, 2016 at 12:07:24PM +0200, Florian Westphal wrote: > It did use a fixed-size bucket list plus single lock to protect add/del. > > Unlike the main conntrack table we only need to add and remove keys. > Convert it to rhashtable to get table autosizing and per-bucket locking. > > The maximum number of entries is -- as before -- tied to the number of > conntracks so we do not need another upperlimit. > > The change does not handle rhashtable_remove_fast error, only possible > "error" is -ENOENT, and that is something that can happen legitimetely, > e.g. because nat module was inserted at a later time and no src manip > took place yet. > > Tested with http-client-benchmark + httpterm with DNAT and SNAT rules > in place. Applied, thanks. I'm fixing this minor glitch here. CC [M] net/netfilter/nf_nat_core.o net/netfilter/nf_nat_core.c: In function ‘nf_nat_proto_clean’: net/netfilter/nf_nat_core.c:555:6: warning: unused variable ‘err’ [-Wunused-variable] int err; ^ No need to resend. -- 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