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 /module/zfs/zfs_vfsops.c | |
| 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 'module/zfs/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index fc63ea569..5e15faca4 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -795,9 +795,11 @@ zfs_sb_create(const char *osname, zfs_mntopts_t *zmo, zfs_sb_t **zsbp) rw_init(&zsb->z_teardown_inactive_lock, NULL, RW_DEFAULT, NULL); rw_init(&zsb->z_fuid_lock, NULL, RW_DEFAULT, NULL); - zsb->z_hold_mtx = vmem_zalloc(sizeof (kmutex_t) * ZFS_OBJ_MTX_SZ, + zsb->z_hold_mtx_size = MIN(1 << (highbit64(zfs_object_mutex_size) - 1), + ZFS_OBJ_MTX_MAX); + zsb->z_hold_mtx = vmem_zalloc(sizeof (kmutex_t) * zsb->z_hold_mtx_size, KM_SLEEP); - for (i = 0; i != ZFS_OBJ_MTX_SZ; i++) + for (i = 0; i != zsb->z_hold_mtx_size; i++) mutex_init(&zsb->z_hold_mtx[i], NULL, MUTEX_DEFAULT, NULL); *zsbp = zsb; @@ -807,7 +809,7 @@ out: dmu_objset_disown(os, zsb); *zsbp = NULL; - vmem_free(zsb->z_hold_mtx, sizeof (kmutex_t) * ZFS_OBJ_MTX_SZ); + vmem_free(zsb->z_hold_mtx, sizeof (kmutex_t) * zsb->z_hold_mtx_size); kmem_free(zsb, sizeof (zfs_sb_t)); return (error); } @@ -909,9 +911,9 @@ zfs_sb_free(zfs_sb_t *zsb) rrm_destroy(&zsb->z_teardown_lock); rw_destroy(&zsb->z_teardown_inactive_lock); rw_destroy(&zsb->z_fuid_lock); - for (i = 0; i != ZFS_OBJ_MTX_SZ; i++) + for (i = 0; i != zsb->z_hold_mtx_size; i++) mutex_destroy(&zsb->z_hold_mtx[i]); - vmem_free(zsb->z_hold_mtx, sizeof (kmutex_t) * ZFS_OBJ_MTX_SZ); + vmem_free(zsb->z_hold_mtx, sizeof (kmutex_t) * zsb->z_hold_mtx_size); zfs_mntopts_free(zsb->z_mntopts); kmem_free(zsb, sizeof (zfs_sb_t)); } |