[v2] scsi: storvsc: Correctly set number of hardware queues for IDE disk

Commit Message

Long Li Jan. 14, 2020, 12:08 a.m. UTC

From: Long Li <[e-mail]>

Commit 0ed881027690 ("scsi: storvsc: setup 1:1 mapping between hardware queue and CPU queue")
introduced a regression for disks attached to IDE. For these disks the host VSP only offers
one VMBUS channel. Setting multiple queues can overload the VMBUS channel and result in
performance drop for high queue depth workload on system with large number of CPUs.

Fix it by leaving the number of hardware queues to 1 (default value) for IDE
disks.

Fixes: 0ed881027690 ("scsi: storvsc: setup 1:1 mapping between hardware queue and CPU queue")
Signed-off-by: Long Li <[e-mail]>
Reviewed-by: Ming Lei <[e-mail]>
---

Changes:
v2: Use pre-computed bool variable dev_is_ide

 drivers/scsi/storvsc_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Martin K. Petersen Jan. 16, 2020, 4:03 a.m. UTC | #1

Long,

> Commit 0ed881027690 ("scsi: storvsc: setup 1:1 mapping between
> hardware queue and CPU queue") introduced a regression for disks
> attached to IDE. For these disks the host VSP only offers one VMBUS
> channel. Setting multiple queues can overload the VMBUS channel and
> result in performance drop for high queue depth workload on system
> with large number of CPUs.

Applied to 5.5/scsi-fixes, thanks!

Patch

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index f8faf8b3d965..fb41636519ee 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1842,9 +1842,11 @@  static int storvsc_probe(struct hv_device *device,
 	 */
 	host->sg_tablesize = (stor_device->max_transfer_bytes >> PAGE_SHIFT);
 	/*
+	 * For non-IDE disks, the host supports multiple channels.
 	 * Set the number of HW queues we are supporting.
 	 */
-	host->nr_hw_queues = num_present_cpus();
+	if (!dev_is_ide)
+		host->nr_hw_queues = num_present_cpus();
 
 	/*
 	 * Set the error handler work queue.