Yang Yang f5418f48a9 block: fix deadlock between sd_remove & sd_release ... commit 7e04da2dc7 upstream. Our test report the following hung task: [ 2538.459400] INFO: task "kworker/0:0":7 blocked for more than 188 seconds. [ 2538.459427] Call trace: [ 2538.459430] __switch_to+0x174/0x338 [ 2538.459436] __schedule+0x628/0x9c4 [ 2538.459442] schedule+0x7c/0xe8 [ 2538.459447] schedule_preempt_disabled+0x24/0x40 [ 2538.459453] __mutex_lock+0x3ec/0xf04 [ 2538.459456] __mutex_lock_slowpath+0x14/0x24 [ 2538.459459] mutex_lock+0x30/0xd8 [ 2538.459462] del_gendisk+0xdc/0x350 [ 2538.459466] sd_remove+0x30/0x60 [ 2538.459470] device_release_driver_internal+0x1c4/0x2c4 [ 2538.459474] device_release_driver+0x18/0x28 [ 2538.459478] bus_remove_device+0x15c/0x174 [ 2538.459483] device_del+0x1d0/0x358 [ 2538.459488] __scsi_remove_device+0xa8/0x198 [ 2538.459493] scsi_forget_host+0x50/0x70 [ 2538.459497] scsi_remove_host+0x80/0x180 [ 2538.459502] usb_stor_disconnect+0x68/0xf4 [ 2538.459506] usb_unbind_interface+0xd4/0x280 [ 2538.459510] device_release_driver_internal+0x1c4/0x2c4 [ 2538.459514] device_release_driver+0x18/0x28 [ 2538.459518] bus_remove_device+0x15c/0x174 [ 2538.459523] device_del+0x1d0/0x358 [ 2538.459528] usb_disable_device+0x84/0x194 [ 2538.459532] usb_disconnect+0xec/0x300 [ 2538.459537] hub_event+0xb80/0x1870 [ 2538.459541] process_scheduled_works+0x248/0x4dc [ 2538.459545] worker_thread+0x244/0x334 [ 2538.459549] kthread+0x114/0x1bc [ 2538.461001] INFO: task "fsck.":15415 blocked for more than 188 seconds. [ 2538.461014] Call trace: [ 2538.461016] __switch_to+0x174/0x338 [ 2538.461021] __schedule+0x628/0x9c4 [ 2538.461025] schedule+0x7c/0xe8 [ 2538.461030] blk_queue_enter+0xc4/0x160 [ 2538.461034] blk_mq_alloc_request+0x120/0x1d4 [ 2538.461037] scsi_execute_cmd+0x7c/0x23c [ 2538.461040] ioctl_internal_command+0x5c/0x164 [ 2538.461046] scsi_set_medium_removal+0x5c/0xb0 [ 2538.461051] sd_release+0x50/0x94 [ 2538.461054] blkdev_put+0x190/0x28c [ 2538.461058] blkdev_release+0x28/0x40 [ 2538.461063] __fput+0xf8/0x2a8 [ 2538.461066] __fput_sync+0x28/0x5c [ 2538.461070] __arm64_sys_close+0x84/0xe8 [ 2538.461073] invoke_syscall+0x58/0x114 [ 2538.461078] el0_svc_common+0xac/0xe0 [ 2538.461082] do_el0_svc+0x1c/0x28 [ 2538.461087] el0_svc+0x38/0x68 [ 2538.461090] el0t_64_sync_handler+0x68/0xbc [ 2538.461093] el0t_64_sync+0x1a8/0x1ac T1: T2: sd_remove del_gendisk __blk_mark_disk_dead blk_freeze_queue_start ++q->mq_freeze_depth bdev_release mutex_lock(&disk->open_mutex) sd_release scsi_execute_cmd blk_queue_enter wait_event(!q->mq_freeze_depth) mutex_lock(&disk->open_mutex) SCSI does not set GD_OWNS_QUEUE, so QUEUE_FLAG_DYING is not set in this scenario. This is a classic ABBA deadlock. To fix the deadlock, make sure we don't try to acquire disk->open_mutex after freezing the queue. Cc: stable@vger.kernel.org Fixes: eec1be4c30 ("block: delete partitions later in del_gendisk") Signed-off-by: Yang Yang <yang.yang@vivo.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Fixes: and Cc: stable tags are missing. Otherwise this patch looks fine Link: https://lore.kernel.org/r/20240724070412.22521-1-yang.yang@vivo.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2024-08-03 09:00:47 +02:00
..
partitions	Compactifying bdev flags	2024-05-21 13:02:56 -07:00
badblocks.c	badblocks: avoid checking invalid range in badblocks_check()	2023-12-23 18:38:08 -07:00
bdev.c	Compactifying bdev flags	2024-05-21 13:02:56 -07:00
bfq-cgroup.c	block: add blk_time_get_ns() and blk_time_get() helpers	2024-02-05 10:07:22 -07:00
bfq-iosched.c	block: add blk_time_get_ns() and blk_time_get() helpers	2024-02-05 10:07:22 -07:00
bfq-iosched.h	block, bfq: remove BFQ_WEIGHT_LEGACY_DFL	2023-04-06 16:17:32 -06:00
bfq-wf2q.c	block, bfq: inject I/O to underutilized actuators	2023-01-29 15:18:33 -07:00
bio-integrity.c	block: initialize integrity buffer to zero before writing it to media	2024-08-03 08:59:10 +02:00
bio.c	for-6.10-tag	2024-05-14 17:25:36 -07:00
blk-cgroup-fc-appid.c	block: Replace all non-returning strlcpy with strscpy	2023-06-01 09:13:31 -06:00
blk-cgroup-rwstat.c	blk-cgroup: use group allocation/free of per-cpu counters API	2024-04-03 09:10:17 -06:00
blk-cgroup-rwstat.h	block: Use the new blk_opf_t type	2022-07-14 12:14:30 -06:00
blk-cgroup.c	blk-cgroup: Properly propagate the iostat update up the hierarchy	2024-05-15 20:15:54 -06:00
blk-cgroup.h	block: fix q->blkg_list corruption during disk rebind	2024-04-07 15:50:13 -06:00
blk-core.c	block-6.10-20240523	2024-05-23 13:44:47 -07:00
blk-crypto-fallback.c	block, fs: Restore the per-bio/request data lifetime fields	2024-02-06 14:31:05 +01:00
blk-crypto-internal.h	blk-crypto: remove blk_crypto_insert_cloned_request()	2023-03-16 09:35:09 -06:00
blk-crypto-profile.c	blk-crypto: use dynamic lock class for blk_crypto_profile::lock	2023-07-05 16:36:12 -06:00
blk-crypto-sysfs.c	block: make kobj_type structures constant	2023-02-09 09:38:16 -07:00
blk-crypto.c	blk-crypto: make blk_crypto_evict_key() more robust	2023-03-16 09:35:09 -06:00
blk-flush.c	block: fix request.queuelist usage in flush	2024-06-12 10:58:11 -06:00
blk-ia-ranges.c	block: make kobj_type structures constant	2023-02-09 09:38:16 -07:00
blk-integrity.c	block: support PI at non-zero offset within metadata	2024-02-12 08:49:31 -07:00
blk-ioc.c	blk-ioc: fix recursive spin_lock/unlock_irq() in ioc_clear_queue()	2023-06-07 07:51:00 -06:00
blk-iocost.c	blk-iocost: do not WARN if iocg was already offlined	2024-04-19 08:06:24 -06:00
blk-iolatency.c	block: add blk_time_get_ns() and blk_time_get() helpers	2024-02-05 10:07:22 -07:00
blk-ioprio.c	blk-ioprio: Introduce promote-to-rt policy	2023-06-06 22:26:26 -06:00
blk-ioprio.h	blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit	2022-09-26 19:09:31 -06:00
blk-lib.c	block: add a blk_alloc_discard_bio helper	2024-05-07 07:29:42 -06:00
blk-map.c	block: Fix WARNING in _copy_from_iter	2024-01-23 08:56:55 -07:00
blk-merge.c	block: support to account io_ticks precisely	2024-05-09 07:59:44 -06:00
blk-mq-cpumap.c	blk-mq: include <linux/blk-mq.h> in block/blk-mq.h	2023-04-13 06:52:29 -06:00
blk-mq-debugfs.c	block: Remove zone write locking	2024-04-17 08:44:03 -06:00
blk-mq-debugfs.h	block: Replace zone_wlock debugfs entry with zone_wplugs entry	2024-04-17 08:44:03 -06:00
blk-mq-pci.c	blk-mq: include <linux/blk-mq.h> in block/blk-mq.h	2023-04-13 06:52:29 -06:00
blk-mq-sched.c	blk-mq: Remove the hctx 'run' debugfs attribute	2024-01-17 14:16:34 -07:00
blk-mq-sched.h	blk-mq: make sure elevator callbacks aren't called for passthrough request	2023-05-18 19:42:54 -06:00
blk-mq-sysfs.c	blk-mq: include <linux/blk-mq.h> in block/blk-mq.h	2023-04-13 06:52:29 -06:00
blk-mq-tag.c	for-6.5/block-2023-06-23	2023-06-26 12:47:20 -07:00
blk-mq-virtio.c	blk-mq: include <linux/blk-mq.h> in block/blk-mq.h	2023-04-13 06:52:29 -06:00
blk-mq.c	block: check bio alignment in blk_mq_submit_bio	2024-08-03 09:00:37 +02:00
blk-mq.h	block: Do not special-case plugging of zone write operations	2024-04-17 08:44:03 -06:00
blk-pm.c	block: Remove blk_set_runtime_active()	2023-11-20 10:22:40 -07:00
blk-pm.h	block: Remove unused blk_pm_*() function definitions	2021-02-22 06:33:48 -07:00
blk-rq-qos.c	block: correct stale comment in rq_qos_wait	2023-09-18 14:15:28 -06:00
blk-rq-qos.h	block: skip QUEUE_FLAG_STATS and rq-qos for passthrough io	2023-12-01 18:29:18 -07:00
blk-settings.c	block: check for max_hw_sectors underflow	2024-05-28 06:55:23 -06:00
blk-stat.c	blk-throttle: remove CONFIG_BLK_DEV_THROTTLING_LOW	2024-05-09 09:44:55 -06:00
blk-stat.h	block: delete redundant function declaration	2024-05-27 13:58:06 -06:00
blk-sysfs.c	blk-throttle: delay initialization until configuration	2024-05-09 09:44:56 -06:00
blk-throttle.c	blk-throttle: Fix incorrect display of io.max	2024-05-30 19:44:29 -06:00
blk-throttle.h	blk-throttle: Fix incorrect display of io.max	2024-05-30 19:44:29 -06:00
blk-timeout.c	block: blk-timeout: delete duplicated word	2020-07-31 16:29:47 -06:00
blk-wbt.c	for-6.9/block-20240310	2024-03-11 11:43:44 -07:00
blk-wbt.h	blk-wbt: remove the separate write cache tracking	2023-12-26 09:28:10 -07:00
blk-zoned.c	block: Optimize disk zone resource cleanup	2024-06-12 10:56:45 -06:00
blk.h	bd_inode series	2024-05-21 09:51:42 -07:00
bounce.c	block, fs: Restore the per-bio/request data lifetime fields	2024-02-06 14:31:05 +01:00
bsg-lib.c	scsi: bsg: Pass queue_limits to bsg_setup_queue()	2024-04-11 21:37:48 -04:00
bsg.c	SCSI misc on 20230629	2023-06-30 11:57:07 -07:00
disk-events.c	block: move bdev_mark_dead out of disk_check_media_change	2023-10-28 13:29:23 +02:00
early-lookup.c	wrapper for access to ->bd_partno	2024-05-02 17:48:09 -04:00
elevator.c	block: Remove elevator required features	2024-04-17 08:44:03 -06:00
elevator.h	block: Remove elevator required features	2024-04-17 08:44:03 -06:00
fops.c	bd_inode series	2024-05-21 09:51:42 -07:00
genhd.c	block: fix deadlock between sd_remove & sd_release	2024-08-03 09:00:47 +02:00
holder.c	block: fix deadlock between bd_link_disk_holder and partition scan	2024-02-23 07:44:19 -07:00
ioctl.c	Compactifying bdev flags	2024-05-21 13:02:56 -07:00
ioprio.c	block: move __get_task_ioprio() into header file	2024-01-08 12:27:39 -07:00
Kconfig	blk-throttle: remove CONFIG_BLK_DEV_THROTTLING_LOW	2024-05-09 09:44:55 -06:00
Kconfig.iosched	block: Default to use cgroup support for BFQ	2023-01-30 09:42:42 -07:00
kyber-iosched.c	blk-mq: pass a flags argument to elevator_type->insert_requests	2023-04-13 06:52:30 -06:00
Makefile	block: Move zone related debugfs attribute to blk-zoned.c	2024-04-17 08:44:03 -06:00
mq-deadline.c	block/mq-deadline: Fix the tag reservation code	2024-08-03 08:59:13 +02:00
opal_proto.h	block: sed-opal: handle empty atoms when parsing response	2024-02-16 15:52:45 -07:00
sed-opal.c	block: sed-opal: avoid possible wrong address reference in read_sed_opal_key()	2024-06-12 10:53:20 -06:00
t10-pi.c	block: t10-pi: add MODULE_DESCRIPTION()	2024-05-20 08:07:44 -06:00