From: Wenchao Hao <haowenchao2@huawei.com>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
<linux-scsi@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <louhongxiang@huawei.com>,
Wenchao Hao <haowenchao2@huawei.com>
Subject: [PATCH v2 4/4] scsi: scsi_core: Fix IO hang when device removing
Date: Thu, 28 Sep 2023 15:35:43 +0800 [thread overview]
Message-ID: <20230928073543.3496394-5-haowenchao2@huawei.com> (raw)
In-Reply-To: <20230928073543.3496394-1-haowenchao2@huawei.com>
shost_for_each_device() would skip devices which is in progress of
removing, so scsi_run_queue() for these devices would be skipped in
scsi_run_host_queues() after blocking hosts' IO.
IO hang would be caused if return true when state is SDEV_CANCEL with
following order:
T1: T2:scsi_error_handler
__scsi_remove_device()
scsi_device_set_state(sdev, SDEV_CANCEL)
...
sd_remove()
del_gendisk()
blk_mq_freeze_queue_wait()
scsi_eh_flush_done_q()
scsi_queue_insert(scmd,...)
Because scsi_queue_insert() would not kick device's queue after commit
8b566edbdbfb ("scsi: core: Only kick the requeue list if necessary")
After scsi_unjam_host(), the scsi error handler would call scsi_run_queue()
to trigger run queue for devices, while it would not run queue for
devices which is in progress of removing because shost_for_each_device()
would skip them.
So the requests added to these queues would not be handled any more,
and the removing device process would hang too.
Fix this issue by using shost_for_each_device_include_deleted() in
scsi_run_queue() to trigger a run queue for devices in removing.
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
---
drivers/scsi/scsi_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c2f647a7c1b0..34b408d182e2 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -466,7 +466,7 @@ void scsi_run_host_queues(struct Scsi_Host *shost)
{
struct scsi_device *sdev;
- shost_for_each_device(sdev, shost)
+ shost_for_each_device_include_deleted(sdev, shost)
scsi_run_queue(sdev->request_queue);
}
--
2.32.0
next prev parent reply other threads:[~2023-09-28 7:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 7:35 [PATCH v2 0/4] SCSI: Fix issues between removing device and error handle Wenchao Hao
2023-09-28 7:35 ` [PATCH v2 1/4] scsi: core: Add new helper to iterate all devices of host Wenchao Hao
2023-09-28 11:41 ` kernel test robot
2023-09-28 7:35 ` [PATCH v2 2/4] scsi: scsi_error: Fix wrong statistic when print error info Wenchao Hao
2023-09-28 7:35 ` [PATCH v2 3/4] scsi: scsi_error: Fix device reset is not triggered Wenchao Hao
2023-09-28 7:35 ` Wenchao Hao [this message]
2023-10-07 9:46 ` [PATCH v2 0/4] SCSI: Fix issues between removing device and error handle Wenchao Hao
2023-10-09 6:59 ` Wenchao Hao
2023-10-10 2:15 ` Wenchao Hao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230928073543.3496394-5-haowenchao2@huawei.com \
--to=haowenchao2@huawei.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=louhongxiang@huawei.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®