Some sites vary some supplimental groups a lot.
To avoid unduely long hash chains, include all of these
in the hash calculation.
Signed-off-by: NeilBrown <neilb@xxxxxxxx>
---
Hi,
I have a customer who had thousands of auth entries with the same
uid and gid, so the hashtable was unbalanced and some lookups were
noticeably slow. This fix helped.
Relatedly, I wonder if we should set a default auth_max_cred_cachesize,
and nfs_access_max_cachesize - smaller than ULONG_MAX.
For auth_max_cred_cachesize, a default of e.g. 256*(1<<auth_hashbits)
is appropriate I think. If there are more auth entries than that,
you'll start to notice lookups taking a long time.
For nfs_access_max_cachesize we want a similar limit as each access
entry pins an auth entry and so keeps a hash chain long.
Or maybe we could change the auth lookup to use an rbtree (or
hash-table of rbtrees?) so that time scales with log of size.
One option is to restore the 'jiffies' field to the access cache, and
discard entries older than (say) 10 minutes.
Thoughts?
Thanks,
NeilBrown
net/sunrpc/auth_generic.c | 15 ++++++++++++---
net/sunrpc/auth_unix.c | 12 +++++++++---
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index f1df9837f1ac..035f7c5f184f 100644
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -81,9 +81,18 @@ static struct rpc_cred *generic_bind_cred(struct rpc_task *task,
static int
generic_hash_cred(struct auth_cred *acred, unsigned int hashbits)
{
- return hash_64(from_kgid(&init_user_ns, acred->gid) |
- ((u64)from_kuid(&init_user_ns, acred->uid) <<
- (sizeof(gid_t) * 8)), hashbits);
+ int ret = hash_32(from_kuid(&init_user_ns, acred->uid), 32);
+
+ if (acred->group_info) {
+ int g;
+
+ for (g = 0; g < acred->group_info->ngroups; g++)
+ ret = hash_32(ret ^
+ from_kgid(&init_user_ns,
+ acred->group_info->gid[g]),
+ 32);
+ }
+ return hash_32(ret ^ from_kgid(&init_user_ns, acred->gid), hashbits);
}
/*
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 82337e1ec9cd..20cd4ab3b339 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -47,9 +47,15 @@ unx_destroy(struct rpc_auth *auth)
static int
unx_hash_cred(struct auth_cred *acred, unsigned int hashbits)
{
- return hash_64(from_kgid(&init_user_ns, acred->gid) |
- ((u64)from_kuid(&init_user_ns, acred->uid) <<
- (sizeof(gid_t) * 8)), hashbits);
+ int ret = hash_32(from_kuid(&init_user_ns, acred->uid), 32);
+ if (acred->group_info) {
+ int g;
+
+ for (g = 0; g < acred->group_info->ngroups && g < UNX_NGROUPS; g++)
+ ret = hash_32(ret ^ from_kgid(&init_user_ns,
+ acred->group_info->gid[g]), 32);
+ }
+ return hash_32(ret ^ from_kgid(&init_user_ns, acred->gid), hashbits);
}
/*
--
2.14.0.rc0.dirty
Attachment:
signature.asc
Description: PGP signature
