[PATCH v2 2/2] nft_hash: define max_shift rhashtable parameter
flat view
STALE4261d
SUPERSEDED
From: Josh Hunt <hidden>
Date: 2015-02-24 16:10:58
Also in:
netfilter-devel
Subsystem:
netfilter, networking [general], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Status: Superseded by v4 (posted 2015-02-24). [go to v4]
Revision v2 (3 revisions archived).
Revisions (3)
- v2 current
- v3 [diff against previous]
- v4 [diff against previous]
You must define a max_shift parameter to rhashtable or else the table cannot grow. This sets max_shift for nft_hash to 24, which will allow the table to grow to 2^24 or 16 million buckets. Signed-off-by: Josh Hunt <redacted> --- net/netfilter/nft_hash.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index 61e6c40..839ed30 100644
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c@@ -23,6 +23,9 @@ /* We target a hash table size of 4, element hint is 75% of final size */ #define NFT_HASH_ELEMENT_HINT 3 +/* Set default of 2^24 buckets or 16 million entries */ +#define NFT_HASH_MAX_ELEMENTS 24 + struct nft_hash_elem { struct rhash_head node; struct nft_data key;
@@ -192,6 +195,7 @@ static int nft_hash_init(const struct nft_set *set, .key_offset = offsetof(struct nft_hash_elem, key), .key_len = set->klen, .hashfn = jhash, + .max_shift = NFT_HASH_MAX_ELEMENTS, .grow_decision = rht_grow_above_75, .shrink_decision = rht_shrink_below_30, };
--
1.7.9.5