This is a note to let you know that I've just added the patch titled
Revert "block: freeze the queue earlier in del_gendisk"
to the 5.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-block-freeze-the-queue-earlier-in-del_gendisk.patch
and it can be found in the queue-5.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@xxxxxx>
Date: Mon, 19 Sep 2022 16:40:49 +0200
Subject: Revert "block: freeze the queue earlier in del_gendisk"
From: Christoph Hellwig <hch@xxxxxx>
commit 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 upstream.
This reverts commit a09b314005f3a0956ebf56e01b3b80339df577cc.
Dusty Mabe reported consistent hang during CoreOS shutdown with a MD
RAID1 setup. Although apparently similar hangs happened before,
and this patch most likely is not the root cause it made it much
more severe. Revert it until we can figure out what is going on
with the md driver.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Link: https://lore.kernel.org/r/20220919144049.978907-1-hch@xxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
block/genhd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -625,7 +625,6 @@ void del_gendisk(struct gendisk *disk)
* Prevent new I/O from crossing bio_queue_enter().
*/
blk_queue_start_drain(q);
- blk_mq_freeze_queue_wait(q);
if (!(disk->flags & GENHD_FL_HIDDEN)) {
sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
@@ -649,6 +648,8 @@ void del_gendisk(struct gendisk *disk)
pm_runtime_set_memalloc_noio(disk_to_dev(disk), false);
device_del(disk_to_dev(disk));
+ blk_mq_freeze_queue_wait(q);
+
blk_throtl_cancel_bios(disk->queue);
blk_sync_queue(q);
Patches currently in stable-queue which might be from hch@xxxxxx are
queue-5.19/blk-mq-fix-error-handling-in-__blk_mq_alloc_disk.patch
queue-5.19/block-simplify-disk-shutdown.patch
queue-5.19/scsi-core-fix-a-use-after-free.patch
queue-5.19/revert-block-freeze-the-queue-earlier-in-del_gendisk.patch
queue-5.19/block-call-blk_mq_exit_queue-from-disk_release-for-never-added-disks.patch
queue-5.19/block-remove-queue_flag_dead.patch
queue-5.19/pmem-fix-a-name-collision.patch
queue-5.19/block-stop-setting-the-nomerges-flags-in-blk_cleanup.patch
queue-5.19/block-do-not-call-blk_put_queue-if-gendisk-allocation-fails.patch
