From: Dexuan Cui <decui@microsoft.com>
To: kys@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org,
jejb@linux.ibm.com, martin.petersen@oracle.com,
haiyangz@microsoft.com, ming.lei@redhat.com, bvanassche@acm.org,
john.garry@huawei.com, linux-scsi@vger.kernel.org,
linux-hyperv@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dexuan Cui <decui@microsoft.com>,
stable@vger.kernel.org
Subject: [PATCH] scsi: storvsc: Cap scsi_driver.can_queue to fix a hang issue during boot
Date: Wed, 6 Oct 2021 00:03:45 -0700 [thread overview]
Message-ID: <20211006070345.51713-1-decui@microsoft.com> (raw)
After commit ea2f0f77538c, a 416-CPU VM running on Hyper-V hangs during
boot because scsi_add_host_with_dma() sets shost->cmd_per_lun to a
negative number:
'max_outstanding_req_per_channel' is 352,
'max_sub_channels' is (416 - 1) / 4 = 103, so in storvsc_probe(),
scsi_driver.can_queue = 352 * (103 + 1) * (100 - 10) / 100 = 32947, which
is bigger than SHRT_MAX (i.e. 32767).
Fix the hang issue by capping scsi_driver.can_queue.
Add the below Fixed tag though ea2f0f77538c itself is good.
Fixes: ea2f0f77538c ("scsi: core: Cap scsi_host cmd_per_lun at can_queue")
Cc: stable@vger.kernel.org
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
drivers/scsi/storvsc_drv.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index ebbbc1299c62..ba374908aec2 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1976,6 +1976,16 @@ static int storvsc_probe(struct hv_device *device,
(max_sub_channels + 1) *
(100 - ring_avail_percent_lowater) / 100;
+ /*
+ * v5.14 (see commit ea2f0f77538c) implicitly requires that
+ * scsi_driver.can_queue should not exceed SHRT_MAX, otherwise
+ * scsi_add_host_with_dma() sets shost->cmd_per_lun to a negative
+ * number (note: the type of the "cmd_per_lun" field is "short"), and
+ * the system may hang during early boot.
+ */
+ if (scsi_driver.can_queue > SHRT_MAX)
+ scsi_driver.can_queue = SHRT_MAX;
+
host = scsi_host_alloc(&scsi_driver,
sizeof(struct hv_host_device));
if (!host)
--
2.17.1
next reply other threads:[~2021-10-06 7:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 7:03 Dexuan Cui [this message]
2021-10-06 7:17 ` [PATCH] scsi: storvsc: Cap scsi_driver.can_queue to fix a hang issue during boot Greg KH
2021-10-06 8:17 ` John Garry
2021-10-06 15:01 ` Michael Kelley
2021-10-06 16:03 ` John Garry
2021-10-06 16:08 ` Michael Kelley
2021-10-06 16:24 ` John Garry
2021-10-06 17:28 ` Dexuan Cui
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=20211006070345.51713-1-decui@microsoft.com \
--to=decui@microsoft.com \
--cc=bvanassche@acm.org \
--cc=haiyangz@microsoft.com \
--cc=jejb@linux.ibm.com \
--cc=john.garry@huawei.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=stable@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).