luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/rhashtable: allow user to set the minimum shifts of shrinking

Browse Source 
Although rhashtable library allows user to specify a quiet big size
for user's created hash table, the table may be shrunk to a
very small size - HASH_MIN_SIZE(4) after object is removed from
the table at the first time. Subsequently, even if the total amount
of objects saved in the table is quite lower than user's initial
setting in a long time, the hash table size is still dynamically
adjusted by rhashtable_shrink() or rhashtable_expand() each time
object is inserted or removed from the table. However, as
synchronize_rcu() has to be called when table is shrunk or
expanded by the two functions, we should permit user to set the
minimum table size through configuring the minimum number of shifts
according to user specific requirement, avoiding these expensive
actions of shrinking or expanding because of calling synchronize_rcu().

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2014-09-03 09:22:36 +08:00 committed by David S. Miller
parent 1f59533f9c
commit 940001762a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/rhashtable.h
View File

@ -44,6 +44,7 @@ struct rhashtable;
* @head_offset: Offset of rhash_head in struct to be hashed * @head_offset: Offset of rhash_head in struct to be hashed
* @hash_rnd: Seed to use while hashing * @hash_rnd: Seed to use while hashing
* @max_shift: Maximum number of shifts while expanding * @max_shift: Maximum number of shifts while expanding
* @min_shift: Minimum number of shifts while shrinking
* @hashfn: Function to hash key * @hashfn: Function to hash key
* @obj_hashfn: Function to hash object * @obj_hashfn: Function to hash object
* @grow_decision: If defined, may return true if table should expand * @grow_decision: If defined, may return true if table should expand
@ -57,6 +58,7 @@ struct rhashtable_params {
size_t head_offset; size_t head_offset;
u32 hash_rnd; u32 hash_rnd;
size_t max_shift; size_t max_shift;
size_t min_shift;
rht_hashfn_t hashfn; rht_hashfn_t hashfn;
rht_obj_hashfn_t obj_hashfn; rht_obj_hashfn_t obj_hashfn;
bool (*grow_decision)(const struct rhashtable *ht, bool (*grow_decision)(const struct rhashtable *ht,

12
lib/rhashtable.c
View File

@ -298,7 +298,7 @@ int rhashtable_shrink(struct rhashtable *ht, gfp_t flags)
ASSERT_RHT_MUTEX(ht); ASSERT_RHT_MUTEX(ht);
if (tbl->size <= HASH_MIN_SIZE) if (ht->shift <= ht->p.min_shift)
return 0; return 0;
ntbl = bucket_table_alloc(tbl->size / 2, flags); ntbl = bucket_table_alloc(tbl->size / 2, flags);
@ -506,9 +506,10 @@ void *rhashtable_lookup_compare(const struct rhashtable *ht, u32 hash,
} }
EXPORT_SYMBOL_GPL(rhashtable_lookup_compare); EXPORT_SYMBOL_GPL(rhashtable_lookup_compare);
static size_t rounded_hashtable_size(unsigned int nelem) static size_t rounded_hashtable_size(struct rhashtable_params *params)
{ {
return max(roundup_pow_of_two(nelem * 4 / 3), HASH_MIN_SIZE); return max(roundup_pow_of_two(params->nelem_hint * 4 / 3),
1UL << params->min_shift);
} }
/** /**
@ -566,8 +567,11 @@ int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params)
(!params->key_len && !params->obj_hashfn)) (!params->key_len && !params->obj_hashfn))
return -EINVAL; return -EINVAL;
params->min_shift = max_t(size_t, params->min_shift,
ilog2(HASH_MIN_SIZE));
if (params->nelem_hint) if (params->nelem_hint)
size = rounded_hashtable_size(params->nelem_hint); size = rounded_hashtable_size(params);
tbl = bucket_table_alloc(size, GFP_KERNEL); tbl = bucket_table_alloc(size, GFP_KERNEL);
if (tbl == NULL) if (tbl == NULL)