diff options
| author | Brian Behlendorf <[email protected]> | 2015-12-18 12:19:14 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-15 15:33:44 -0800 |
| commit | 0720116d4dd7a62d2097863fc4c32c3cbd11aefa (patch) | |
| tree | 41a9f5bdc9c3c223a440129e33b5149207a45e04 /include | |
| parent | d21f279a94994f65e6bdcbbca9fd2eb552a0d604 (diff) | |
Add zfs_object_mutex_size module option
Add a zfs_object_mutex_size module option to facilitate resizing the
the per-dataset znode mutex array. Increasing this value may help
make the deadlock described in #4106 less common, but this is not a
proper fix. This patch is primarily to aid debugging and analysis.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tim Chase <[email protected]>
Issue #4106
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/zfs_vfsops.h | 2 | ||||
| -rw-r--r-- | include/sys/zfs_znode.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h index 28407c6f7..a59114a1a 100644 --- a/include/sys/zfs_vfsops.h +++ b/include/sys/zfs_vfsops.h @@ -112,7 +112,7 @@ typedef struct zfs_sb { uint64_t z_groupquota_obj; uint64_t z_replay_eof; /* New end of file - replay only */ sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ -#define ZFS_OBJ_MTX_SZ 256 + uint64_t z_hold_mtx_size; /* znode hold locks size */ kmutex_t *z_hold_mtx; /* znode hold locks */ } zfs_sb_t; diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h index 7e73cf991..59ca085ef 100644 --- a/include/sys/zfs_znode.h +++ b/include/sys/zfs_znode.h @@ -273,9 +273,15 @@ typedef struct znode { /* * Macros for dealing with dmu_buf_hold */ -#define ZFS_OBJ_HASH(obj_num) ((obj_num) & (ZFS_OBJ_MTX_SZ - 1)) +#define ZFS_OBJ_MTX_SZ 64 +#define ZFS_OBJ_MTX_MAX (1024 * 1024) + +extern unsigned int zfs_object_mutex_size; + +#define ZFS_OBJ_HASH(zsb, obj_num) \ + ((obj_num) & ((zsb->z_hold_mtx_size) - 1)) #define ZFS_OBJ_MUTEX(zsb, obj_num) \ - (&(zsb)->z_hold_mtx[ZFS_OBJ_HASH(obj_num)]) + (&(zsb)->z_hold_mtx[ZFS_OBJ_HASH(zsb, obj_num)]) #define ZFS_OBJ_HOLD_ENTER(zsb, obj_num) \ mutex_enter(ZFS_OBJ_MUTEX((zsb), (obj_num))) #define ZFS_OBJ_HOLD_TRYENTER(zsb, obj_num) \ |