block: avoid potential deadlock on zone revalidation failure
Subsystems (2)
Damien Le Moal
maintainerPATCH v2 1/1 block: avoid potential deadlock on zone revalidation failure
If revalidating the zones of a zoned block device with blk_revalidate_disk_zones() fails during a SCSI disk rescan, the following lockdep splat is thrown:
[ 347.251859] [ T11230] sda: failed to revalidate zones
[ 347.261380] [ T11230] ======================================================
[ 347.263882] [ T11230] WARNING: possible circular locking dependency detected
[ 347.266353] [ T11230] 7.1.0+ #1194 Not tainted
[ 347.268052] [ T11230] ------------------------------------------------------
[ 347.270537] [ T11230] tcsh/11230 is trying to acquire lock:
[ 347.272555] [ T11230] ffffffff8f91d400 (wq_pool_mutex){+.+.}-{4:4}, at: destroy_workqueue+0x15d/0x8d0
[ 347.275914] [ T11230]
but task is already holding lock:
[ 347.278646] [ T11230] ffff88812fa1bcc0 (&q->q_usage_counter(io)#5){++++}-{0:0}, at: blk_mq_freeze_queue_nomemsave+0x16/0x30
[ 347.282503] [ T11230]
which lock already depends on the new lock.[ 347.286239] [ T11230]
the existing dependency chain (in reverse order) is:
[ 347.289408] [ T11230]
-> #2 (&q->q_usage_counter(io)#5){++++}-{0:0}:
[ 347.292437] [ T11230] blk_alloc_queue+0x5ca/0x750
[ 347.294379] [ T11230] blk_mq_alloc_queue+0x14c/0x240
[ 347.296375] [ T11230] scsi_alloc_sdev+0x871/0xd10 [scsi_mod]
[ 347.298619] [ T11230] scsi_probe_and_add_lun+0x600/0xc50 [scsi_mod]
[ 347.301056] [ T11230] __scsi_scan_target+0x187/0x3b0 [scsi_mod]
[ 347.303385] [ T11230] scsi_scan_channel+0xf2/0x180 [scsi_mod]
[ 347.305651] [ T11230] scsi_scan_host_selected+0x20b/0x2d0 [scsi_mod]
[ 347.308119] [ T11230] do_scan_async+0x42/0x420 [scsi_mod]
[ 347.310276] [ T11230] async_run_entry_fn+0x94/0x5a0
[ 347.312284] [ T11230] process_one_work+0x8da/0x1690
[ 347.314287] [ T11230] worker_thread+0x5fe/0x1010
[ 347.316216] [ T11230] kthread+0x358/0x450
[ 347.317675] [ T11230] ret_from_fork+0x5b9/0x8e0
[ 347.319181] [ T11230] ret_from_fork_asm+0x11/0x20
[ 347.320778] [ T11230]
-> #1 (fs_reclaim){+.+.}-{0:0}:
[ 347.322890] [ T11230] fs_reclaim_acquire+0xd5/0x120
[ 347.324464] [ T11230] __kmalloc_cache_node_noprof+0x39/0x620
[ 347.326223] [ T11230] init_rescuer+0x19b/0x560
[ 347.327697] [ T11230] workqueue_init+0x33b/0x6a0
[ 347.329224] [ T11230] kernel_init_freeable+0x2eb/0x600
[ 347.330881] [ T11230] kernel_init+0x1c/0x140
[ 347.332334] [ T11230] ret_from_fork+0x5b9/0x8e0
[ 347.333847] [ T11230] ret_from_fork_asm+0x11/0x20
[ 347.335360] [ T11230]
-> #0 (wq_pool_mutex){+.+.}-{4:4}:
[ 347.337510] [ T11230] __lock_acquire+0xdea/0x2260
[ 347.339030] [ T11230] lock_acquire+0x187/0x2f0
[ 347.340495] [ T11230] __mutex_lock+0x1ab/0x2600
[ 347.341464] [ T11230] destroy_workqueue+0x15d/0x8d0
[ 347.342485] [ T11230] disk_free_zone_resources+0xd5/0x560
[ 347.343577] [ T11230] blk_revalidate_disk_zones+0x620/0xac7
[ 347.344723] [ T11230] sd_zbc_revalidate_zones+0x1dd/0x790 [sd_mod]
[ 347.345938] [ T11230] sd_revalidate_disk+0xc66/0x8e60 [sd_mod]
[ 347.347112] [ T11230] scsi_rescan_device+0x1f9/0x310 [scsi_mod]
[ 347.348318] [ T11230] store_rescan_field+0x19/0x20 [scsi_mod]
[ 347.349507] [ T11230] kernfs_fop_write_iter+0x3d2/0x5e0
[ 347.350565] [ T11230] vfs_write+0x469/0x1000
[ 347.351484] [ T11230] ksys_write+0x116/0x250
[ 347.352403] [ T11230] do_syscall_64+0xf0/0x6e0
[ 347.353361] [ T11230] entry_SYSCALL_64_after_hwframe+0x4b/0x53
[ 347.354533] [ T11230]
other info that might help us debug this:[ 347.356432] [ T11230] Chain exists of:
wq_pool_mutex --> fs_reclaim --> &q->q_usage_counter(io)#5[ 347.358919] [ T11230] Possible unsafe locking scenario:
[ 347.360307] [ T11230] CPU0 CPU1
[ 347.361327] [ T11230] ---- ----
[ 347.362340] [ T11230] lock(&q->q_usage_counter(io)#5);
[ 347.363344] [ T11230] lock(fs_reclaim);
[ 347.364526] [ T11230] lock(&q->q_usage_counter(io)#5);
[ 347.365968] [ T11230] lock(wq_pool_mutex);
[ 347.366811] [ T11230]
*** DEADLOCK ***This happens because SCSI disk rescan is executed from a work context and a failure of blk_revalidate_disk_zones() causes a call to disk_free_zone_resources() which will free the disk zone write plug workqueue.
Avoid this by delaying the destruction of the disk zone write plug workqueue to disk_release(). Do this by introducing the function disk_release_zone_resources() and using this new function from disk_release(). This new function destroys the zone write plugs workqueue and calls disk_free_zone_resources(), thus allowing to remove the call to destroy_workqueue() from disk_free_zone_resources(). disk_alloc_zone_resources() is modified to not create the disk zone write plug work queue if it already exists.
---
Changes from v1:
- Added missing drain_workqueue() call in disk_free_zone_resources() to ensure that we have no work in it before destroying the hash table.
- Added review tags
block/blk-zoned.c | 42 ++++++++++++++++++++++++++++-------------- block/blk.h | 4 ++-- block/genhd.c | 2 +- 3 files changed, 31 insertions(+), 17 deletions(-)
block/blk-zoned.c +28 -14
@@ -1923,11 +1923,20 @@ static int disk_alloc_zone_resources(struct gendisk *disk,if (!disk->zone_wplugs_pool) goto free_hash; - disk->zone_wplugs_wq = -alloc_workqueue ("%s_zwplugs" ,WQ_MEM_RECLAIM |WQ_HIGHPRI |WQ_PERCPU , - pool_size, disk->disk_name); -if (!disk->zone_wplugs_wq) - goto destroy_pool; +/* +* We may already have a zone write plug workqueue as this function may +* be called after disk_free_zone_resources(), which does not destroy +* the workqueue (the zone write plugs workqueue is destroyed at +* disk_release() time). +*/ +if (!disk->zone_wplugs_wq) { + disk->zone_wplugs_wq = +alloc_workqueue ("%s_zwplugs" , +WQ_MEM_RECLAIM |WQ_HIGHPRI |WQ_PERCPU , + pool_size, disk->disk_name); +if (!disk->zone_wplugs_wq) + goto destroy_pool; + } disk->zone_wplugs_worker = kthread_create(disk_zone_wplugs_worker, disk,
@@ -1935,15 +1944,12 @@ static int disk_alloc_zone_resources(struct gendisk *disk,if (IS_ERR (disk->zone_wplugs_worker)) { ret =PTR_ERR (disk->zone_wplugs_worker); disk->zone_wplugs_worker =NULL ; - goto destroy_wq; + goto destroy_pool; }wake_up_process (disk->zone_wplugs_worker);return 0 ; -destroy_wq: -destroy_workqueue (disk->zone_wplugs_wq); - disk->zone_wplugs_wq =NULL ; destroy_pool:mempool_destroy (disk->zone_wplugs_pool); disk->zone_wplugs_pool =NULL ;
@@ -1999,7 +2005,7 @@ static void disk_set_zones_cond_array(struct gendisk *disk, u8 *zones_cond)kfree_rcu_mightsleep (zones_cond); } -void disk_free_zone_resources (struct gendisk *disk) +static void disk_free_zone_resources (struct gendisk *disk) {if (disk->zone_wplugs_worker) {kthread_stop (disk->zone_wplugs_worker);
@@ -2007,10 +2013,8 @@ void disk_free_zone_resources(struct gendisk *disk) }WARN_ON_ONCE (!list_empty (&disk->zone_wplugs_list)); -if (disk->zone_wplugs_wq) { -destroy_workqueue (disk->zone_wplugs_wq); - disk->zone_wplugs_wq =NULL ; - } +if (disk->zone_wplugs_wq) +drain_workqueue (disk->zone_wplugs_wq);disk_destroy_zone_wplugs_hash_table (disk);
@@ -2020,6 +2024,16 @@ void disk_free_zone_resources(struct gendisk *disk) disk->nr_zones =0 ; } +void disk_release_zone_resources (struct gendisk *disk) +{ +if (disk->zone_wplugs_wq) { +destroy_workqueue (disk->zone_wplugs_wq); + disk->zone_wplugs_wq =NULL ; + } + +disk_free_zone_resources (disk); +} +struct blk_revalidate_zone_args {struct gendisk *disk;u8 *zones_cond;
block/blk.h +2 -2
@@ -528,7 +528,7 @@ static inline void ioc_clear_queue(struct request_queue *q)#ifdef CONFIG_BLK_DEV_ZONED void disk_init_zone_resources (struct gendisk *disk); -void disk_free_zone_resources (struct gendisk *disk); +void disk_release_zone_resources (struct gendisk *disk);static inline bool bio_zone_write_plugging (struct bio *bio) {return bio_flagged (bio,BIO_ZONE_WRITE_PLUGGING );
@@ -581,7 +581,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, blk_mode_t mode,static inline void disk_init_zone_resources (struct gendisk *disk) { } -static inline void disk_free_zone_resources (struct gendisk *disk) +static inline void disk_release_zone_resources (struct gendisk *disk) { }static inline bool bio_zone_write_plugging (struct bio *bio)
block/genhd.c +1 -1
@@ -1300,7 +1300,7 @@ static void disk_release(struct device *dev)disk_release_events (disk);kfree (disk->random); -disk_free_zone_resources (disk); +disk_release_zone_resources (disk);xa_destroy (&disk->part_tbl);kobject_put (&disk->queue_kobj);
Signature · 1 line
2.54.0
Still looks good:
Quoted 18 lines · Damien Le Moal
If revalidating the zones of a zoned block device with
blk_revalidate_disk_zones()fails during a SCSI disk rescan, the following lockdep splat is thrown:[ 347.251859] [ T11230] sda: failed to revalidate zones[ 347.261380] [ T11230] ====================================================== [ 347.263882] [ T11230] WARNING: possible circular locking dependency detected [ 347.266353] [ T11230] 7.1.0+ #1194 Not tainted [ 347.268052] [ T11230] ------------------------------------------------------ [ 347.270537] [ T11230] tcsh/11230 is trying to acquire lock: [ 347.272555] [ T11230] ffffffff8f91d400 (wq_pool_mutex){+.+.}-{4:4}, at: destroy_workqueue+0x15d/0x8d0 [ 347.275914] [ T11230] but task is already holding lock: [ 347.278646] [ T11230] ffff88812fa1bcc0 (&q->q_usage_counter(io)#5){++++}-{0:0}, at: blk_mq_freeze_queue_nomemsave+0x16/0x30 [ 347.282503] [ T11230] which lock already depends on the new lock.
Quoted 1 line
[...]
Applied, thanks!
[1/1] block: avoid potential deadlock on zone revalidation failure
commit: 3dd63dba8f9cb6990a40af7ed66ee0159f475819
Best regards,
Signature · 1 line
Jens Axboe