Commit cf625013 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: 9b1ce7f0 ("block: Implement zone append emulation")
Reported-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Tested-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250611044416.2351850-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f705d33c

block/blk-zoned.c

+5 −2
Original line number Diff line number Diff line
@@ -1307,7 +1307,6 @@ static void blk_zone_wplug_bio_work(struct work_struct *work) 
	spin_unlock_irqrestore(&zwplug->lock, flags);



	bdev = bio->bi_bdev;

	submit_bio_noacct_nocheck(bio);



	/*

	 * 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

	 * 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);

	} else {

		blk_mq_submit_bio(bio);

	}



put_zwplug:

	/* Drop the reference we took in disk_zone_wplug_schedule_bio_work(). */