From 2ccfcac0054daf6c36631742351eeefa8a2ebcc4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Sep 2022 09:15:17 +0200 Subject: [PATCH] 5.19-stable patches added patches: revert-block-freeze-the-queue-earlier-in-del_gendisk.patch --- ...eze-the-queue-earlier-in-del_gendisk.patch | 44 +++++++++++++++++++ queue-5.19/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-5.19/revert-block-freeze-the-queue-earlier-in-del_gendisk.patch diff --git a/queue-5.19/revert-block-freeze-the-queue-earlier-in-del_gendisk.patch b/queue-5.19/revert-block-freeze-the-queue-earlier-in-del_gendisk.patch new file mode 100644 index 00000000000..4021417c081 --- /dev/null +++ b/queue-5.19/revert-block-freeze-the-queue-earlier-in-del_gendisk.patch @@ -0,0 +1,44 @@ +From 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Mon, 19 Sep 2022 16:40:49 +0200 +Subject: Revert "block: freeze the queue earlier in del_gendisk" + +From: Christoph Hellwig + +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 +Link: https://lore.kernel.org/r/20220919144049.978907-1-hch@lst.de +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + 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); diff --git a/queue-5.19/series b/queue-5.19/series index 3d4d98115c5..4ce827e442b 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -204,3 +204,4 @@ ext4-avoid-unnecessary-spreading-of-allocations-among-groups.patch ext4-make-directory-inode-spreading-reflect-flexbg-size.patch ext4-use-locality-group-preallocation-for-small-closed-files.patch ext4-use-buckets-for-cr-1-block-scan-instead-of-rbtree.patch +revert-block-freeze-the-queue-earlier-in-del_gendisk.patch -- 2.47.3