Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: don't use submit_bio_noacct_nocheck in blk_zone_wplug_bio_work 

Bios queued up in the zone write plug have already gone through all all
preparation in the submit_bio path, including the freeze protection.

Submitting them through submit_bio_noacct_nocheck duplicates the work
and can can cause deadlocks when freezing a queue with pending bio
write plugs.

Go straight to ->submit_bio or blk_mq_submit_bio to bypass the
superfluous extra freeze protection and checks.

Fixes: 9b1ce7f0c6 ("block: Implement zone append emulation")
Reported-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Tested-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250611044416.2351850-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2025-06-11 06:44:16 +02:00 committed by Jens Axboe
parent f705d33c2f
commit cf625013d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/blk-zoned.c
View File

@ -1307,7 +1307,6 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)
spin_unlock_irqrestore(&zwplug->lock, flags); spin_unlock_irqrestore(&zwplug->lock, flags);
bdev = bio->bi_bdev; bdev = bio->bi_bdev;
submit_bio_noacct_nocheck(bio);
/* /*
* blk-mq devices will reuse the extra reference on the request queue * blk-mq devices will reuse the extra reference on the request queue
@ -1315,8 +1314,12 @@ static void blk_zone_wplug_bio_work(struct work_struct *work)
* path for BIO-based devices will not do that. So drop this extra * path for BIO-based devices will not do that. So drop this extra
* reference here. * reference here.
*/ */
if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO)) if (bdev_test_flag(bdev, BD_HAS_SUBMIT_BIO)) {
bdev->bd_disk->fops->submit_bio(bio);
blk_queue_exit(bdev->bd_disk->queue); blk_queue_exit(bdev->bd_disk->queue);
} else {
blk_mq_submit_bio(bio);
}
put_zwplug: put_zwplug:
/* Drop the reference we took in disk_zone_wplug_schedule_bio_work(). */ /* Drop the reference we took in disk_zone_wplug_schedule_bio_work(). */