Skip to contentSkip to conversation

storvsc: setup 1:1 mapping between hardware queue and CPU queue

PATCH Applied [email protected] 5 participants 6 messages Sep 6, 2019 – Sep 24, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 storvsc: setup 1:1 mapping between hardware queue and CPU queue

From: Long Li <[email protected]>

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

This patch advertises num_present_cpus() as number of hardware queues. This will have upper layer setup 1:1 mapping between hardware queue and CPU queue and avoid unnecessary locking when issuing I/O.

---

Changes:
v2: rely on default upper layer function to map queues. (suggested by Ming Lei <[email protected]>)
v3: use num_present_cpus() instead of num_online_cpus(). Hyper-v doesn't support hot-add CPUs. (suggested by Michael Kelley <[email protected]>)
v4: move change logs to after Signed-of-by

 drivers/scsi/storvsc_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +1 -2
index b89269120a2d..cf987712041a 100644
@@ -1836,8 +1836,7 @@ static int storvsc_probe(struct hv_device *device,
 	/*
 	 * Set the number of HW queues we are supporting.
 	 */
-	if (stor_device->num_sc != 0)
-		host->nr_hw_queues = stor_device->num_sc + 1;
+	host->nr_hw_queues = num_present_cpus();
 
 	/*
 	 * Set the error handler work queue.
Signature · 1 line
2.17.1
Reviewed-by on v4 1/1
#1 lore raw

From: Long Li <[email protected]> Sent: Friday, September 6, 2019 10:24 AM

Quoted 37 lines

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

This patch advertises num_present_cpus() as number of hardware queues. This will have upper layer setup 1:1 mapping between hardware queue and CPU queue and avoid unnecessary locking when issuing I/O.

---

Changes:
v2: rely on default upper layer function to map queues. (suggested by Ming Lei <[email protected]>)
v3: use num_present_cpus() instead of num_online_cpus(). Hyper-v doesn't support hot-add CPUs. (suggested by Michael Kelley <[email protected]>)
v4: move change logs to after Signed-of-by

 drivers/scsi/storvsc_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +1 -3
index b89269120a2d..cf987712041a 100644
@@ -1836,8 +1836,7 @@ static int storvsc_probe(struct hv_device *device,
 	/*
 	 * Set the number of HW queues we are supporting.
 	 */
-	if (stor_device->num_sc != 0)
-		host->nr_hw_queues = stor_device->num_sc + 1;
+	host->nr_hw_queues = num_present_cpus();
 
 	/*
 	 * Set the error handler work queue.
--
Quoted 1 line

2.17.1

#2 lore raw
In reply to [email protected]
Quoted 28 lines · On Fri, Sep 06, 2019 at 10:24:20AM -0700, [email protected] wrote:

From: Long Li <[email protected]>

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

This patch advertises num_present_cpus() as number of hardware queues. This will have upper layer setup 1:1 mapping between hardware queue and CPU queue and avoid unnecessary locking when issuing I/O.

---

Changes:
v2: rely on default upper layer function to map queues. (suggested by Ming Lei <[email protected]>)
v3: use num_present_cpus() instead of num_online_cpus(). Hyper-v doesn't support hot-add CPUs. (suggested by Michael Kelley <[email protected]>)
v4: move change logs to after Signed-of-by

drivers/scsi/storvsc_drv.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +0 -0
index b89269120a2d..cf987712041a 100644

drivers/scsi/storvsc_drv.c static int storvsc_probe(struct hv_device *device, · line 1839

Quoted 6 lines
drivers/scsi/storvsc_drv.c +1 -2
@@ -1836,8 +1836,7 @@ static int storvsc_probe(struct hv_device *device,
 	/*
 	 * Set the number of HW queues we are supporting.
 	 */
-	if (stor_device->num_sc != 0)
-		host->nr_hw_queues = stor_device->num_sc + 1;
+	host->nr_hw_queues = num_present_cpus();

Just looking at the change notes for v3: why isn't this num_active_cpus() then? One can still isolate CPUs on hyper-v, no?

--
Thanks,
Sasha

#3 lore raw
Quoted 29 lines

Subject: Re: [Patch v4] storvsc: setup 1:1 mapping between hardware queue and CPU queue

Quoted 25 lines · On Fri, Sep 06, 2019 at 10:24:20AM -0700, [email protected] wrote:

From: Long Li <[email protected]>

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

This patch advertises num_present_cpus() as number of hardware queues. This will have upper layer setup 1:1 mapping between hardware queue and CPU queue and avoid unnecessary locking when issuing I/O.

---

Changes:
v2: rely on default upper layer function to map queues. (suggested by Ming Lei
<[email protected]>)
v3: use num_present_cpus() instead of num_online_cpus(). Hyper-v doesn't support hot-add CPUs. (suggested by Michael Kelley <[email protected]>)
v4: move change logs to after Signed-of-by

drivers/scsi/storvsc_drv.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 14 lines

drivers/scsi/storvsc_drv.c static int storvsc_probe(struct hv_device *device, · line 1839

Quoted 11 lines
drivers/scsi/storvsc_drv.c +1 -2
index b89269120a2d..cf987712041a 100644
@@ -1836,8 +1836,7 @@ static int storvsc_probe(struct hv_device *device,
 	/*
 	 * Set the number of HW queues we are supporting.
 	 */
-	if (stor_device->num_sc != 0)
-		host->nr_hw_queues = stor_device->num_sc + 1;
+	host->nr_hw_queues = num_present_cpus();

Just looking at the change notes for v3: why isn't this num_active_cpus() then? One can still isolate CPUs on hyper-v, no?

The isolated CPU can be made online at run time. For example, even maxcpus=x is put on the boot line, individual CPUs can still be made online/offline.

Quoted 4 lines

--
Thanks,
Sasha

#4 lore raw
Quoted 18 lines

Subject: RE: [Patch v4] storvsc: setup 1:1 mapping between hardware queue and CPU queue

Quoted 15 lines

Subject: Re: [Patch v4] storvsc: setup 1:1 mapping between hardware queue and CPU queue

Quoted 11 lines · On Fri, Sep 06, 2019 at 10:24:20AM -0700, [email protected] wrote:

From: Long Li <[email protected]>

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

This patch advertises num_present_cpus() as number of hardware queues. This will have upper layer setup 1:1 mapping between hardware queue and CPU queue and avoid unnecessary locking when issuing I/O.

Hi Martin,

I have addressed all comments on this patch. Can you merge it to SCSI?

If there is anything else I need to change, please let me know.

Thanks

Long

Quoted 37 lines
Quoted 14 lines
Quoted 14 lines

---

Changes:
v2: rely on default upper layer function to map queues. (suggested by Ming Lei
<[email protected]>)
v3: use num_present_cpus() instead of num_online_cpus(). Hyper-v doesn't support hot-add CPUs. (suggested by Michael Kelley <[email protected]>)
v4: move change logs to after Signed-of-by

drivers/scsi/storvsc_drv.c | 3 +--

1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 14 lines

drivers/scsi/storvsc_drv.c static int storvsc_probe(struct hv_device *device, · line 1839

Quoted 11 lines
drivers/scsi/storvsc_drv.c +1 -2
index b89269120a2d..cf987712041a 100644
@@ -1836,8 +1836,7 @@ static int storvsc_probe(struct hv_device *device,
 	/*
 	 * Set the number of HW queues we are supporting.
 	 */
-	if (stor_device->num_sc != 0)
-		host->nr_hw_queues = stor_device->num_sc + 1;
+	host->nr_hw_queues = num_present_cpus();

Just looking at the change notes for v3: why isn't this num_active_cpus() then? One can still isolate CPUs on hyper-v, no?

The isolated CPU can be made online at run time. For example, even maxcpus=x is put on the boot line, individual CPUs can still be made online/offline.

Quoted 4 lines

--
Thanks,
Sasha

#5 lore raw
In reply to [email protected]

Long,

Quoted 3 lines

storvsc doesn't use a dedicated hardware queue for a given CPU queue. When issuing I/O, it selects returning CPU (hardware queue) dynamically based on vmbus channel usage across all channels.

Applied to 5.4/scsi-fixes. Thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering