diff options
| author | Davidlohr Bueso <dave@stgolabs.net> | 2018-07-16 13:26:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-25 11:26:10 +0200 |
| commit | 561478584f8f884193fbc2bd1dc0eb289d091c42 (patch) | |
| tree | 69d704c98fa73f69037d3c0674bff375310d8e65 | |
| parent | 677f3c02b57a0ce5f7395a93f67ed40eb01f0558 (diff) | |
| download | linux-561478584f8f884193fbc2bd1dc0eb289d091c42.tar.gz linux-561478584f8f884193fbc2bd1dc0eb289d091c42.tar.bz2 linux-561478584f8f884193fbc2bd1dc0eb289d091c42.zip | |
lib/rhashtable: consider param->min_size when setting initial table size
[ Upstream commit 107d01f5ba10f4162c38109496607eb197059064 ]
rhashtable_init() currently does not take into account the user-passed
min_size parameter unless param->nelem_hint is set as well. As such,
the default size (number of buckets) will always be HASH_DEFAULT_SIZE
even if the smallest allowed size is larger than that. Remediate this
by unconditionally calling into rounded_hashtable_size() and handling
things accordingly.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | lib/rhashtable.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 2b2b79974b61..11e89c3b76e3 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -923,8 +923,16 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_stop); static size_t rounded_hashtable_size(const struct rhashtable_params *params) { - return max(roundup_pow_of_two(params->nelem_hint * 4 / 3), - (unsigned long)params->min_size); + size_t retsize; + + if (params->nelem_hint) + retsize = max(roundup_pow_of_two(params->nelem_hint * 4 / 3), + (unsigned long)params->min_size); + else + retsize = max(HASH_DEFAULT_SIZE, + (unsigned long)params->min_size); + + return retsize; } static u32 rhashtable_jhash2(const void *key, u32 length, u32 seed) @@ -981,8 +989,6 @@ int rhashtable_init(struct rhashtable *ht, struct bucket_table *tbl; size_t size; - size = HASH_DEFAULT_SIZE; - if ((!params->key_len && !params->obj_hashfn) || (params->obj_hashfn && !params->obj_cmpfn)) return -EINVAL; @@ -1009,8 +1015,7 @@ int rhashtable_init(struct rhashtable *ht, ht->p.min_size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE); - if (params->nelem_hint) - size = rounded_hashtable_size(&ht->p); + size = rounded_hashtable_size(&ht->p); if (params->locks_mul) ht->p.locks_mul = roundup_pow_of_two(params->locks_mul); |