[PATCH v3 17/17] SUNRPC: use new hashtable implementation in auth
Switch sunrpc/auth.c to use the new hashtable implementation. This reduces the amount of generic unrelated code in auth.c. Signed-off-by: Sasha Levin --- net/sunrpc/auth.c | 45 +++-- 1 files changed, 19 insertions(+), 26 deletions(-) diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index b5c067b..5d50e2d 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef RPC_DEBUG # define RPCDBG_FACILITY RPCDBG_AUTH @@ -222,7 +223,7 @@ static DEFINE_SPINLOCK(rpc_credcache_lock); static void rpcauth_unhash_cred_locked(struct rpc_cred *cred) { - hlist_del_rcu(>cr_hash); + hash_del_rcu(>cr_hash); smp_mb__before_clear_bit(); clear_bit(RPCAUTH_CRED_HASHED, >cr_flags); } @@ -249,16 +250,15 @@ int rpcauth_init_credcache(struct rpc_auth *auth) { struct rpc_cred_cache *new; - unsigned int hashsize; new = kmalloc(sizeof(*new), GFP_KERNEL); if (!new) goto out_nocache; new->hashbits = auth_hashbits; - hashsize = 1U << new->hashbits; - new->hashtable = kcalloc(hashsize, sizeof(new->hashtable[0]), GFP_KERNEL); + new->hashtable = kmalloc(HASH_REQUIRED_SIZE(new->hashbits), GFP_KERNEL); if (!new->hashtable) goto out_nohashtbl; + hash_init_size(new->hashtable, new->hashbits); spin_lock_init(>lock); auth->au_credcache = new; return 0; @@ -292,25 +292,20 @@ void rpcauth_clear_credcache(struct rpc_cred_cache *cache) { LIST_HEAD(free); - struct hlist_head *head; + struct hlist_node *n, *t; struct rpc_cred *cred; - unsigned int hashsize = 1U << cache->hashbits; - int i; + int i; spin_lock(_credcache_lock); spin_lock(>lock); - for (i = 0; i < hashsize; i++) { - head = >hashtable[i]; - while (!hlist_empty(head)) { - cred = hlist_entry(head->first, struct rpc_cred, cr_hash); - get_rpccred(cred); - if (!list_empty(>cr_lru)) { - list_del(>cr_lru); - number_cred_unused--; - } - list_add_tail(>cr_lru, ); - rpcauth_unhash_cred_locked(cred); + hash_for_each_safe_size(cache->hashtable, cache->hashbits, i, n, t, cred, cr_hash) { + get_rpccred(cred); + if (!list_empty(>cr_lru)) { + list_del(>cr_lru); + number_cred_unused--; } + list_add_tail(>cr_lru, ); + rpcauth_unhash_cred_locked(cred); } spin_unlock(>lock); spin_unlock(_credcache_lock); @@ -408,14 +403,11 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, LIST_HEAD(free); struct rpc_cred_cache *cache = auth->au_credcache; struct hlist_node *pos; - struct rpc_cred *cred = NULL, - *entry, *new; - unsigned int nr; - - nr = hash_long(acred->uid, cache->hashbits); + struct rpc_cred *cred = NULL, *entry = NULL, *new; rcu_read_lock(); - hlist_for_each_entry_rcu(entry, pos, >hashtable[nr], cr_hash) { + hash_for_each_possible_rcu_size(cache->hashtable, cred, cache->hashbits, + pos, cr_hash, acred->uid) { if (!entry->cr_ops->crmatch(acred, entry, flags)) continue; spin_lock(>lock); @@ -439,7 +431,8 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, } spin_lock(>lock); - hlist_for_each_entry(entry, pos, >hashtable[nr], cr_hash) { + hash_for_each_possible_size(cache->hashtable, entry, cache->hashbits, pos, + cr_hash, acred->uid) { if (!entry->cr_ops->crmatch(acred, entry, flags)) continue; cred = get_rpccred(entry); @@ -448,7 +441,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, if (cred == NULL) { cred = new; set_bit(RPCAUTH_CRED_HASHED, >cr_flags); - hlist_add_head_rcu(>cr_hash, >hashtable[nr]); + hash_add_size(cache->hashtable, cache->hashbits, >cr_hash, acred->uid); } else list_add_tail(>cr_lru, ); spin_unlock(>lock); -- 1.7.8.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3 17/17] SUNRPC: use new hashtable implementation in auth
Switch sunrpc/auth.c to use the new hashtable implementation. This reduces the amount of generic unrelated code in auth.c. Signed-off-by: Sasha Levin levinsasha...@gmail.com --- net/sunrpc/auth.c | 45 +++-- 1 files changed, 19 insertions(+), 26 deletions(-) diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index b5c067b..5d50e2d 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -15,6 +15,7 @@ #include linux/sunrpc/clnt.h #include linux/sunrpc/gss_api.h #include linux/spinlock.h +#include linux/hashtable.h #ifdef RPC_DEBUG # define RPCDBG_FACILITY RPCDBG_AUTH @@ -222,7 +223,7 @@ static DEFINE_SPINLOCK(rpc_credcache_lock); static void rpcauth_unhash_cred_locked(struct rpc_cred *cred) { - hlist_del_rcu(cred-cr_hash); + hash_del_rcu(cred-cr_hash); smp_mb__before_clear_bit(); clear_bit(RPCAUTH_CRED_HASHED, cred-cr_flags); } @@ -249,16 +250,15 @@ int rpcauth_init_credcache(struct rpc_auth *auth) { struct rpc_cred_cache *new; - unsigned int hashsize; new = kmalloc(sizeof(*new), GFP_KERNEL); if (!new) goto out_nocache; new-hashbits = auth_hashbits; - hashsize = 1U new-hashbits; - new-hashtable = kcalloc(hashsize, sizeof(new-hashtable[0]), GFP_KERNEL); + new-hashtable = kmalloc(HASH_REQUIRED_SIZE(new-hashbits), GFP_KERNEL); if (!new-hashtable) goto out_nohashtbl; + hash_init_size(new-hashtable, new-hashbits); spin_lock_init(new-lock); auth-au_credcache = new; return 0; @@ -292,25 +292,20 @@ void rpcauth_clear_credcache(struct rpc_cred_cache *cache) { LIST_HEAD(free); - struct hlist_head *head; + struct hlist_node *n, *t; struct rpc_cred *cred; - unsigned int hashsize = 1U cache-hashbits; - int i; + int i; spin_lock(rpc_credcache_lock); spin_lock(cache-lock); - for (i = 0; i hashsize; i++) { - head = cache-hashtable[i]; - while (!hlist_empty(head)) { - cred = hlist_entry(head-first, struct rpc_cred, cr_hash); - get_rpccred(cred); - if (!list_empty(cred-cr_lru)) { - list_del(cred-cr_lru); - number_cred_unused--; - } - list_add_tail(cred-cr_lru, free); - rpcauth_unhash_cred_locked(cred); + hash_for_each_safe_size(cache-hashtable, cache-hashbits, i, n, t, cred, cr_hash) { + get_rpccred(cred); + if (!list_empty(cred-cr_lru)) { + list_del(cred-cr_lru); + number_cred_unused--; } + list_add_tail(cred-cr_lru, free); + rpcauth_unhash_cred_locked(cred); } spin_unlock(cache-lock); spin_unlock(rpc_credcache_lock); @@ -408,14 +403,11 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, LIST_HEAD(free); struct rpc_cred_cache *cache = auth-au_credcache; struct hlist_node *pos; - struct rpc_cred *cred = NULL, - *entry, *new; - unsigned int nr; - - nr = hash_long(acred-uid, cache-hashbits); + struct rpc_cred *cred = NULL, *entry = NULL, *new; rcu_read_lock(); - hlist_for_each_entry_rcu(entry, pos, cache-hashtable[nr], cr_hash) { + hash_for_each_possible_rcu_size(cache-hashtable, cred, cache-hashbits, + pos, cr_hash, acred-uid) { if (!entry-cr_ops-crmatch(acred, entry, flags)) continue; spin_lock(cache-lock); @@ -439,7 +431,8 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, } spin_lock(cache-lock); - hlist_for_each_entry(entry, pos, cache-hashtable[nr], cr_hash) { + hash_for_each_possible_size(cache-hashtable, entry, cache-hashbits, pos, + cr_hash, acred-uid) { if (!entry-cr_ops-crmatch(acred, entry, flags)) continue; cred = get_rpccred(entry); @@ -448,7 +441,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred, if (cred == NULL) { cred = new; set_bit(RPCAUTH_CRED_HASHED, cred-cr_flags); - hlist_add_head_rcu(cred-cr_hash, cache-hashtable[nr]); + hash_add_size(cache-hashtable, cache-hashbits, cred-cr_hash, acred-uid); } else list_add_tail(new-cr_lru, free); spin_unlock(cache-lock); -- 1.7.8.6 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at