Commit 48e75b43 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller

rhashtable: compact struct rhashtable_params

By using smaller datatypes this (rather large) struct shrinks considerably
(80 -> 48 bytes on x86_64).

As this is embedded in other structs, this also rerduces size of several
others, e.g. cls_fl_head or nft_hash.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e06422c4
...@@ -127,23 +127,23 @@ struct rhashtable; ...@@ -127,23 +127,23 @@ struct rhashtable;
* @head_offset: Offset of rhash_head in struct to be hashed * @head_offset: Offset of rhash_head in struct to be hashed
* @max_size: Maximum size while expanding * @max_size: Maximum size while expanding
* @min_size: Minimum size while shrinking * @min_size: Minimum size while shrinking
* @nulls_base: Base value to generate nulls marker
* @automatic_shrinking: Enable automatic shrinking of tables
* @locks_mul: Number of bucket locks to allocate per cpu (default: 128) * @locks_mul: Number of bucket locks to allocate per cpu (default: 128)
* @automatic_shrinking: Enable automatic shrinking of tables
* @nulls_base: Base value to generate nulls marker
* @hashfn: Hash function (default: jhash2 if !(key_len % 4), or jhash) * @hashfn: Hash function (default: jhash2 if !(key_len % 4), or jhash)
* @obj_hashfn: Function to hash object * @obj_hashfn: Function to hash object
* @obj_cmpfn: Function to compare key with object * @obj_cmpfn: Function to compare key with object
*/ */
struct rhashtable_params { struct rhashtable_params {
size_t nelem_hint; u16 nelem_hint;
size_t key_len; u16 key_len;
size_t key_offset; u16 key_offset;
size_t head_offset; u16 head_offset;
unsigned int max_size; unsigned int max_size;
unsigned int min_size; u16 min_size;
u32 nulls_base;
bool automatic_shrinking; bool automatic_shrinking;
size_t locks_mul; u8 locks_mul;
u32 nulls_base;
rht_hashfn_t hashfn; rht_hashfn_t hashfn;
rht_obj_hashfn_t obj_hashfn; rht_obj_hashfn_t obj_hashfn;
rht_obj_cmpfn_t obj_cmpfn; rht_obj_cmpfn_t obj_cmpfn;
......
...@@ -967,7 +967,7 @@ int rhashtable_init(struct rhashtable *ht, ...@@ -967,7 +967,7 @@ int rhashtable_init(struct rhashtable *ht,
ht->max_elems = ht->p.max_size * 2; ht->max_elems = ht->p.max_size * 2;
} }
ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE); ht->p.min_size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE);
if (params->nelem_hint) if (params->nelem_hint)
size = rounded_hashtable_size(&ht->p); size = rounded_hashtable_size(&ht->p);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment