diff --git a/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk-4c66.patch b/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk-4c66.patch new file mode 100644 index 0000000..5072341 --- /dev/null +++ b/patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk-4c66.patch @@ -0,0 +1,49 @@ +From 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Mon, 19 Sep 2022 16:40:49 +0200 +Subject: [PATCH] Revert "block: freeze the queue earlier in del_gendisk" +Git-commit: 4c66a326b5ab784cddd72de07ac5b6210e9e1b06 +Patch-mainline: v6.0-rc7 +References: git-fixes + +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: Coly Li + +--- + block/genhd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/block/genhd.c b/block/genhd.c +index d36fabf0abc1..988ba52fd331 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -602,7 +602,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"); +@@ -626,6 +625,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); +-- +2.35.3 + diff --git a/series.conf b/series.conf index dff24d2..9b06fab 100644 --- a/series.conf +++ b/series.conf @@ -33531,6 +33531,7 @@ patches.suse/USB-serial-option-add-Quectel-RM520N.patch patches.suse/arm64-topology-fix-possible-overflow-in-amu_fie_setu.patch patches.suse/s390-dasd-fix-Oops-in-dasd_alias_get_start_dev-due-to-missing-pavgroup + patches.suse/Revert-block-freeze-the-queue-earlier-in-del_gendisk-4c66.patch patches.suse/workqueue-don-t-skip-lockdep-work-dependency-in-canc.patch patches.suse/cgroup-cgroup_get_from_id-must-check-the-looked-up-kn-is-a-directory.patch patches.suse/serial-Create-uart_xmit_advance.patch