diff options
| author | George Wilson <george.wilson@delphix.com> | 2016-06-09 09:59:28 -0400 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-07-15 14:36:59 -0700 |
| commit | 8ee802cce77385ce86e5fe8520cee28ac9fd4669 (patch) | |
| tree | 810cdda2d10fbd10ebf911d278984ba80dcbc524 /usr/src/uts/common/fs/nfs/nfs_auth.c | |
| parent | 4b5c8e93cab28d3c65ba9d407fd8f46e3be1db1c (diff) | |
| download | illumos-joyent-8ee802cce77385ce86e5fe8520cee28ac9fd4669.tar.gz | |
6458 nfsauth_cache_get() deadlock with kmem reap thread
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Sebastien Roy <sebastien.roy@delphix.com>
Reviewed by: Steven Hartland <steven.hartland@multiplay.co.uk>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/uts/common/fs/nfs/nfs_auth.c')
| -rw-r--r-- | usr/src/uts/common/fs/nfs/nfs_auth.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs_auth.c b/usr/src/uts/common/fs/nfs/nfs_auth.c index 268badd6c0..2851f8bef9 100644 --- a/usr/src/uts/common/fs/nfs/nfs_auth.c +++ b/usr/src/uts/common/fs/nfs/nfs_auth.c @@ -22,6 +22,7 @@ /* * Copyright 2016 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ #include <sys/param.h> @@ -59,6 +60,8 @@ volatile uint_t nfsauth_cache_hit; volatile uint_t nfsauth_cache_miss; volatile uint_t nfsauth_cache_refresh; volatile uint_t nfsauth_cache_reclaim; +volatile uint_t exi_cache_auth_reclaim_failed; +volatile uint_t exi_cache_clnt_reclaim_failed; /* * The lifetime of an auth cache entry: @@ -1434,10 +1437,8 @@ exi_cache_trim(struct exportinfo *exi) avl_tree_t *tree; for (i = 0; i < AUTH_TABLESIZE; i++) { - tree = exi->exi_cache[i]; stale_time = gethrestime_sec() - NFSAUTH_CACHE_TRIM; - rw_enter(&exi->exi_cache_lock, RW_READER); /* @@ -1445,7 +1446,16 @@ exi_cache_trim(struct exportinfo *exi) * used for NFSAUTH_CACHE_TRIM seconds. */ for (c = avl_first(tree); c != NULL; c = AVL_NEXT(tree, c)) { - rw_enter(&c->authc_lock, RW_WRITER); + /* + * We are being called by the kmem subsystem to reclaim + * memory so don't block if we can't get the lock. + */ + if (rw_tryenter(&c->authc_lock, RW_WRITER) == 0) { + exi_cache_auth_reclaim_failed++; + rw_exit(&exi->exi_cache_lock); + return; + } + for (p = avl_first(&c->authc_tree); p != NULL; p = next) { next = AVL_NEXT(&c->authc_tree, p); @@ -1491,7 +1501,8 @@ exi_cache_trim(struct exportinfo *exi) if (rw_tryupgrade(&exi->exi_cache_lock) == 0) { rw_exit(&exi->exi_cache_lock); - rw_enter(&exi->exi_cache_lock, RW_WRITER); + exi_cache_clnt_reclaim_failed++; + continue; } for (c = avl_first(tree); c != NULL; c = nextc) { |