c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix lock reversal on device removal cancel

Browse Source 
FreeBSD kernel's WITNESS code detected lock ordering violation in
spa_vdev_remove_cancel_sync().  It took svr_lock while holding
ms_lock, which is opposite to other places.  I was thinking to
resolve it similar to #17145, but looking closer I don't think
we even need svr_lock at that point, since we already asserted
svr_allocd_segs is empty, and we don't need to add there segments
we are going to call free_mapped_segment_cb for.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Allan Jude <allan@klarasystems.com>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes #17164
This commit is contained in:
Alexander Motin 2025-04-01 09:31:24 -04:00 committed by GitHub
parent 367d34b3aa
commit 301da593ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
module/zfs/vdev_removal.c
View File

@ -1894,6 +1894,8 @@ spa_vdev_remove_cancel_sync(void *arg, dmu_tx_t *tx)
vdev_indirect_mapping_max_offset(vim)); vdev_indirect_mapping_max_offset(vim));
} }
zfs_range_tree_t *segs = zfs_range_tree_create(NULL, ZFS_RANGE_SEG64,
NULL, 0, 0);
for (uint64_t msi = 0; msi < vd->vdev_ms_count; msi++) { for (uint64_t msi = 0; msi < vd->vdev_ms_count; msi++) {
metaslab_t *msp = vd->vdev_ms[msi]; metaslab_t *msp = vd->vdev_ms[msi];
@ -1913,17 +1915,16 @@ spa_vdev_remove_cancel_sync(void *arg, dmu_tx_t *tx)
ASSERT0(zfs_range_tree_space(msp->ms_defer[i])); ASSERT0(zfs_range_tree_space(msp->ms_defer[i]));
ASSERT0(zfs_range_tree_space(msp->ms_freed)); ASSERT0(zfs_range_tree_space(msp->ms_freed));
if (msp->ms_sm != NULL) { if (msp->ms_sm != NULL)
mutex_enter(&svr->svr_lock); VERIFY0(space_map_load(msp->ms_sm, segs, SM_ALLOC));
VERIFY0(space_map_load(msp->ms_sm,
svr->svr_allocd_segs, SM_ALLOC));
zfs_range_tree_walk(msp->ms_unflushed_allocs, zfs_range_tree_walk(msp->ms_unflushed_allocs,
zfs_range_tree_add, svr->svr_allocd_segs); zfs_range_tree_add, segs);
zfs_range_tree_walk(msp->ms_unflushed_frees, zfs_range_tree_walk(msp->ms_unflushed_frees,
zfs_range_tree_remove, svr->svr_allocd_segs); zfs_range_tree_remove, segs);
zfs_range_tree_walk(msp->ms_freeing, zfs_range_tree_walk(msp->ms_freeing,
zfs_range_tree_remove, svr->svr_allocd_segs); zfs_range_tree_remove, segs);
mutex_exit(&msp->ms_lock);
/* /*
* Clear everything past what has been synced, * Clear everything past what has been synced,
@ -1933,18 +1934,11 @@ spa_vdev_remove_cancel_sync(void *arg, dmu_tx_t *tx)
uint64_t sm_end = msp->ms_sm->sm_start + uint64_t sm_end = msp->ms_sm->sm_start +
msp->ms_sm->sm_size; msp->ms_sm->sm_size;
if (sm_end > syncd) if (sm_end > syncd)
zfs_range_tree_clear(svr->svr_allocd_segs, zfs_range_tree_clear(segs, syncd, sm_end - syncd);
syncd, sm_end - syncd);
mutex_exit(&svr->svr_lock); zfs_range_tree_vacate(segs, free_mapped_segment_cb, vd);
}
mutex_exit(&msp->ms_lock);
mutex_enter(&svr->svr_lock);
zfs_range_tree_vacate(svr->svr_allocd_segs,
free_mapped_segment_cb, vd);
mutex_exit(&svr->svr_lock);
} }
zfs_range_tree_destroy(segs);
/* /*
* Note: this must happen after we invoke free_mapped_segment_cb, * Note: this must happen after we invoke free_mapped_segment_cb,