mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 11:18:52 +03:00
Fix snapshot automount expiry cancellation deadlock
A deadlock occurs when snapshot expiry tasks are cancelled while holding locks. The snapshot expiry task (snapentry_expire) spawns an umount process and waits for it to complete. Concurrently, ARC memory pressure triggers arc_prune which calls zfs_exit_fs(), attempting to cancel the expiry task while holding locks. The umount process spawned by the expiry task blocks trying to acquire locks held by arc_prune, which is blocked waiting for the expiry task to complete. This creates a circular dependency: expiry task waits for umount, umount waits for arc_prune, arc_prune waits for expiry task. Fix by adding non-blocking cancellation support to taskq_cancel_id(). The zfs_exit_fs() path calls zfsctl_snapshot_unmount_delay() to reschedule the unmount, which needs to cancel any existing expiry task. It now uses non-blocking cancellation to avoid waiting while holding locks, breaking the deadlock by returning immediately when the task is already running. The per-entry se_taskqid_lock has been removed, with all taskqid operations now protected by the global zfs_snapshot_lock held as WRITER. Additionally, an se_in_umount flag prevents recursive waits when zfsctl_destroy() is called during unmount. The taskqid is now only cleared by the caller on successful cancellation; running tasks clear their own taskqid upon completion. Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ameer Hamza <ahamza@ixsystems.com> Closes #17941
This commit is contained in:
committed by
Brian Behlendorf
parent
663dc86de2
commit
74bbdda1ef
@@ -1452,7 +1452,8 @@ dmu_objset_upgrade_stop(objset_t *os)
|
||||
os->os_upgrade_id = 0;
|
||||
mutex_exit(&os->os_upgrade_lock);
|
||||
|
||||
if ((taskq_cancel_id(os->os_spa->spa_upgrade_taskq, id)) == 0) {
|
||||
if ((taskq_cancel_id(os->os_spa->spa_upgrade_taskq, id,
|
||||
B_TRUE)) == 0) {
|
||||
dsl_dataset_long_rele(dmu_objset_ds(os), upgrade_tag);
|
||||
}
|
||||
txg_wait_synced(os->os_spa->spa_dsl_pool, 0);
|
||||
|
||||
Reference in New Issue
Block a user