History

scsi: storvsc: Fix calculation of sub-channel count

When the number of sub-channels offered by Hyper-V is >= the number of CPUs in the VM, calculate the correct number of sub-channels. The current code produces one too many. This scenario arises only when the number of CPUs is artificially restricted (for example, with maxcpus=<n> on the kernel boot line), because Hyper-V normally offers a sub-channel count < number of CPUs. While the current code doesn't break, the extra sub-channel is unbalanced across the CPUs (for example, a total of 5 channels on a VM with 4 CPUs).

Michael Kelley committed 7 years ago

Commit 382e06d1 parent 1cb1d2c1 file · +11 −2Browse files

Unified · Split

drivers/scsi/storvsc_drv.c+11−2
@@ -668,13 +668,22 @@ static void handle_multichannel_storage(struct hv_device *device, int max_chns) · 667 unmodified lines
668668 {
669669 struct device *dev = &device->device;
670670 struct storvsc_device *stor_device;
671− int num_cpus = num_online_cpus();
672671 int num_sc;
673672 struct storvsc_cmd_request *request;
674673 struct vstor_packet *vstor_packet;
675674 int ret, t;
676675
677− num_sc = ((max_chns > num_cpus) ? num_cpus : max_chns);
676+ /*
677+ * If the number of CPUs is artificially restricted, such as
678+ * with maxcpus=1 on the kernel boot line, Hyper-V could offer
679+ * sub-channels >= the number of CPUs. These sub-channels
680+ * should not be created. The primary channel is already created
681+ * and assigned to one CPU, so check against # CPUs - 1.
682+ */
683+ num_sc = min((int)(num_online_cpus() - 1), max_chns);
684+ if (!num_sc)
685+ return;
686+
678687 stor_device = get_out_stor_device(device);
679688 if (!stor_device)
680689 return;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t