]> git.baikalelectronics.ru Git - kernel.git/commit
scsi: core: sysfs: Fix hang when device state is set via sysfs
authorMike Christie <michael.christie@oracle.com>
Fri, 5 Nov 2021 22:10:48 +0000 (17:10 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 17 Nov 2021 00:42:30 +0000 (19:42 -0500)
commitfa5a9c54cdce1ba2d8c3c7665287406ce1852fe9
treeb32ae2927fc1ec4f0c9b01a698e646987e839618
parent6cde98f8befde208638c6d36b9d1e82626aa30e8
scsi: core: sysfs: Fix hang when device state is set via sysfs

This fixes a regression added with:

commit 20ff3269c95f ("scsi: core: Fix capacity set to zero after
offlinining device")

The problem is that after iSCSI recovery, iscsid will call into the kernel
to set the dev's state to running, and with that patch we now call
scsi_rescan_device() with the state_mutex held. If the SCSI error handler
thread is just starting to test the device in scsi_send_eh_cmnd() then it's
going to try to grab the state_mutex.

We are then stuck, because when scsi_rescan_device() tries to send its I/O
scsi_queue_rq() calls -> scsi_host_queue_ready() -> scsi_host_in_recovery()
which will return true (the host state is still in recovery) and I/O will
just be requeued. scsi_send_eh_cmnd() will then never be able to grab the
state_mutex to finish error handling.

To prevent the deadlock move the rescan-related code to after we drop the
state_mutex.

This also adds a check for if we are already in the running state. This
prevents extra scans and helps the iscsid case where if the transport class
has already onlined the device during its recovery process then we don't
need userspace to do it again plus possibly block that daemon.

Link: https://lore.kernel.org/r/20211105221048.6541-3-michael.christie@oracle.com
Fixes: 20ff3269c95f ("scsi: core: Fix capacity set to zero after offlinining device")
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: lijinlin <lijinlin3@huawei.com>
Cc: Wu Bo <wubo40@huawei.com>
Reviewed-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Wu Bo <wubo40@huawei.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_sysfs.c