Skip to content

Commit 23918b0

Browse files
Trond Myklebusttorvalds
authored andcommitted
SUNRPC: Fix a performance regression in the RPC authentication code
Fix a regression reported by Max Kellermann whereby kernel profiling showed that his clients were spending 45% of their time in rpcauth_lookup_credcache. It turns out that although his processes had identical uid/gid/groups, generic_match() was failing to detect this, because the task->group_info pointers were not shared. This again lead to the creation of a huge number of identical credentials at the RPC layer. The regression is fixed by comparing the contents of task->group_info if the actual pointers are not identical. Signed-off-by: Trond Myklebust <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 0cb39aa commit 23918b0

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

net/sunrpc/auth_generic.c

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,29 @@ static int
133133
generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
134134
{
135135
struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);
136+
int i;
136137

137138
if (gcred->acred.uid != acred->uid ||
138139
gcred->acred.gid != acred->gid ||
139-
gcred->acred.group_info != acred->group_info ||
140140
gcred->acred.machine_cred != acred->machine_cred)
141-
return 0;
141+
goto out_nomatch;
142+
143+
/* Optimisation in the case where pointers are identical... */
144+
if (gcred->acred.group_info == acred->group_info)
145+
goto out_match;
146+
147+
/* Slow path... */
148+
if (gcred->acred.group_info->ngroups != acred->group_info->ngroups)
149+
goto out_nomatch;
150+
for (i = 0; i < gcred->acred.group_info->ngroups; i++) {
151+
if (GROUP_AT(gcred->acred.group_info, i) !=
152+
GROUP_AT(acred->group_info, i))
153+
goto out_nomatch;
154+
}
155+
out_match:
142156
return 1;
157+
out_nomatch:
158+
return 0;
143159
}
144160

145161
void __init rpc_init_generic_auth(void)

0 commit comments

Comments
 (0)