diff options
| author | Brian Behlendorf <[email protected]> | 2011-03-21 10:19:30 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-03-22 12:14:55 -0700 |
| commit | d6bd8eaae4bdbce8e162414bb6c84ac95fd456b4 (patch) | |
| tree | deaba214b02403d74f2e8a4dfda04bc08c4bce27 /include | |
| parent | 691f6ac4c2858d64afc2a0dc1bd2b8c041d68502 (diff) | |
Fix evict() deadlock
Now that KM_SLEEP is not defined as GFP_NOFS there is the possibility
of synchronous reclaim deadlocks. These deadlocks never existed in the
original OpenSolaris code because all memory reclaim on Solaris is done
asyncronously. Linux does both synchronous (direct) and asynchronous
(indirect) reclaim.
This commit addresses a deadlock caused by inode eviction. A KM_SLEEP
allocation may trigger direct memory reclaim and shrink the inode cache.
This can occur while a mutex in the array of ZFS_OBJ_HOLD mutexes is
held. Through the ->shrink_icache_memory()->evict()->zfs_inactive()->
zfs_zinactive() call path the same mutex may be reacquired resulting
in a deadlock. To avoid this deadlock the process must not reacquire
the mutex when it is already holding it.
This is a reasonable fix for now but longer term the ZFS_OBJ_HOLD
mutex locking should be reevaluated. This infrastructure already
prevents us from ever using the Linux lock dependency analysis tools,
and it may limit scalability.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/zfs_znode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h index b028e2eb2..2f9ca743d 100644 --- a/include/sys/zfs_znode.h +++ b/include/sys/zfs_znode.h @@ -280,6 +280,8 @@ typedef struct znode { mutex_tryenter(ZFS_OBJ_MUTEX((zsb), (obj_num))) #define ZFS_OBJ_HOLD_EXIT(zsb, obj_num) \ mutex_exit(ZFS_OBJ_MUTEX((zsb), (obj_num))) +#define ZFS_OBJ_HOLD_OWNED(zsb, obj_num) \ + mutex_owned(ZFS_OBJ_MUTEX((zsb), (obj_num))) /* * Macros to encode/decode ZFS stored time values from/to struct timespec |