diff options
| author | Florian Westphal <fw@strlen.de> | 2016-05-02 18:39:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-05-05 16:39:47 +0200 |
| commit | 56d52d4892d0e478a005b99ed10d0a7f488ea8c1 (patch) | |
| tree | 89f2c12e4f197ac3876f5ebf01f61b7a3f49dd3e /include/net/netns/conntrack.h | |
| parent | netfilter: conntrack: make netns address part of hash (diff) | |
| download | linux-56d52d4892d0e478a005b99ed10d0a7f488ea8c1.tar.xz linux-56d52d4892d0e478a005b99ed10d0a7f488ea8c1.zip | |
netfilter: conntrack: use a single hashtable for all namespaces
We already include netns address in the hash and compare the netns pointers
during lookup, so even if namespaces have overlapping addresses entries
will be spread across the table.
Assuming 64k bucket size, this change saves 0.5 mbyte per namespace on a
64bit system.
NAT bysrc and expectation hash is still per namespace, those will
changed too soon.
Future patch will also make conntrack object slab cache global again.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netns/conntrack.h')
| -rw-r--r-- | include/net/netns/conntrack.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h index b052785b1590..251c435ee330 100644 --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -93,9 +93,7 @@ struct netns_ct { int sysctl_tstamp; int sysctl_checksum; - unsigned int htable_size; struct kmem_cache *nf_conntrack_cachep; - struct hlist_nulls_head *hash; struct hlist_head *expect_hash; struct ct_pcpu __percpu *pcpu_lists; struct ip_conntrack_stat __percpu *stat; |