From: Marc Dionne <marc.dionne@your-file-system.com>
Date: Tue, 29 Apr 2014 16:48:03 +0000 (-0400)
Subject: libafs: Speed up afs_CheckTokenCache
X-Git-Tag: upstream/1.6.10_pre1^2~66
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=94f1d49af07a2f20b43bdc4e172e1b0aabc1b263;p=packages%2Fo%2Fopenafs.git

libafs: Speed up afs_CheckTokenCache

On systems with a large number of PAGs and files in use, the
periodic daemon job that checks for expired credentials and
cleans up the axs cache can run for a very long time.  This
can lead to kernel soft lockups and eventually hang processes
and file access because of unavailable locks.

Rework the scanning logic in afs_CheckTokenCache to make the
scanning more efficient in most real world cases.  On a test
system accessing ~4000 files from processes in 1000 PAGs, this
has been observed to reduce the runtime of afs_CheckTokenCache
from a problematic ~70s down to about 0.7s.

Additionally, this changes the conditions in which an axscache is
discarded. uid+cell (rather than just uid) must now match, and
if no matching unixuser is found, it will also be discarded.

Adapted from code from Jeffrey Altman who provided the original
loop algorithm and code.

Reviewed-on: http://gerrit.openafs.org/11123
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: D Brashear <shadow@your-file-system.com>
(cherry picked from commit de74227d9c925206cd6d46496ec4682569d3105b)

Change-Id: I72e501cf1cb3e312d17a518666d2d638f1d52ead
Reviewed-on: http://gerrit.openafs.org/11307
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index df18a7fc5..d4b098d6d 100644
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -43,6 +43,7 @@
 #include <inet/ip.h>
 #endif
 
+#include "afs/afs_axscache.h"
 
 /* Exported variables */
 afs_rwlock_t afs_xuser;
@@ -163,6 +164,23 @@ afs_GCUserData(int aforce)
 
 }				/*afs_GCUserData */
 
+static struct unixuser *
+afs_FindUserNoLock(afs_int32 auid, afs_int32 acell)
+{
+    struct unixuser *tu;
+    afs_int32 i;
+
+    AFS_STATCNT(afs_FindUser);
+    i = UHash(auid);
+    for (tu = afs_users[i]; tu; tu = tu->next) {
+	if (tu->uid == auid && ((tu->cell == acell) || (acell == -1))) {
+	    tu->refCount++;
+	    return tu;
+	}
+    }
+    return NULL;
+
+}
 
 #ifndef AFS_PAG_MANAGER
 /*
@@ -176,6 +194,9 @@ afs_CheckTokenCache(void)
     int i;
     struct unixuser *tu;
     afs_int32 now;
+    struct vcache *tvc;
+    struct axscache *tofreelist;
+    int do_scan = 0;
 
     AFS_STATCNT(afs_CheckCacheResets);
     ObtainReadLock(&afs_xvcache);
@@ -183,8 +204,6 @@ afs_CheckTokenCache(void)
     now = osi_Time();
     for (i = 0; i < NUSERS; i++) {
 	for (tu = afs_users[i]; tu; tu = tu->next) {
-	    afs_int32 uid;
-
 	    /*
 	     * If tokens are still good and user has Kerberos tickets,
 	     * check expiration
@@ -204,13 +223,48 @@ afs_CheckTokenCache(void)
 		    tu->states |= (UTokensBad | UNeedsReset);
 		}
 	    }
-	    if (tu->states & UNeedsReset) {
-		tu->states &= ~UNeedsReset;
-		uid = tu->uid;
-		afs_ResetAccessCache(uid, 0);
+	    if (tu->states & UNeedsReset)
+		do_scan = 1;
+	}
+    }
+    /* Skip the potentially expensive scan if nothing to do */
+    if (!do_scan)
+	goto done;
+
+    tofreelist = NULL;
+    for (i = 0; i < VCSIZE; i++) {
+	for (tvc = afs_vhashT[i]; tvc; tvc = tvc->hnext) {
+	    /* really should do this under cache write lock, but that.
+	     * is hard to under locking hierarchy */
+	    if (tvc->Access) {
+		struct axscache **ac, **nac;
+
+		for ( ac = &tvc->Access; *ac;)  {
+		    nac = &(*ac)->next;
+		    tu = afs_FindUserNoLock((*ac)->uid, tvc->f.fid.Cell);
+		    if (tu == NULL || (tu->states & UNeedsReset)) {
+			struct axscache *tmp;
+			tmp = *ac;
+			*ac = *nac;
+			tmp->next = tofreelist;
+			tofreelist = tmp;
+		    } else
+			ac = nac;
+		    if (tu != NULL)
+			tu->refCount--;
+		}
 	    }
 	}
     }
+    afs_FreeAllAxs(&tofreelist);
+    for (i = 0; i < NUSERS; i++) {
+	for (tu = afs_users[i]; tu; tu = tu->next) {
+	    if (tu->states & UNeedsReset)
+		tu->states &= ~UNeedsReset;
+	}
+    }
+
+done:
     ReleaseReadLock(&afs_xuser);
     ReleaseReadLock(&afs_xvcache);
 
@@ -279,21 +333,11 @@ struct unixuser *
 afs_FindUser(afs_int32 auid, afs_int32 acell, afs_int32 locktype)
 {
     struct unixuser *tu;
-    afs_int32 i;
 
-    AFS_STATCNT(afs_FindUser);
-    i = UHash(auid);
     ObtainWriteLock(&afs_xuser, 99);
-    for (tu = afs_users[i]; tu; tu = tu->next) {
-	if (tu->uid == auid && ((tu->cell == acell) || (acell == -1))) {
-	    tu->refCount++;
-	    ReleaseWriteLock(&afs_xuser);
-	    return tu;
-	}
-    }
+    tu = afs_FindUserNoLock(auid, acell);
     ReleaseWriteLock(&afs_xuser);
-    return NULL;
-
+    return tu;
 }				/*afs_FindUser */