Skip to content

Commit 6cb7063

Browse files
mhklinuxmartinkpetersen
authored andcommitted
scsi: storvsc: Don't assume cpu_possible_mask is dense
Current code allocates the stor_chns array with size num_possible_cpus(). This code assumes cpu_possible_mask is dense, which is not true in the general case per [1]. If cpu_possible_mask is sparse, the array might be indexed by a value beyond the size of the array. However, the configurations that Hyper-V provides to guest VMs on x86 and ARM64 hardware, in combination with how architecture specific code assigns Linux CPU numbers, *does* always produce a dense cpu_possible_mask. So the dense assumption is not currently causing failures. But for robustness against future changes in how cpu_possible_mask is populated, update the code to no longer assume dense. The correct approach is to allocate and initialize the array using size "nr_cpu_ids". While this leaves unused array entries corresponding to holes in cpu_possible_mask, the holes are assumed to be minimal and hence the amount of memory wasted by unused entries is minimal. [1] https://lore.kernel.org/lkml/SN6PR02MB4157210CC36B2593F8572E5ED4692@SN6PR02MB4157.namprd02.prod.outlook.com/ Signed-off-by: Michael Kelley <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent bd55f56 commit 6cb7063

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

drivers/scsi/storvsc_drv.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -915,14 +915,13 @@ static int storvsc_channel_init(struct hv_device *device, bool is_fc)
915915

916916
/*
917917
* Allocate state to manage the sub-channels.
918-
* We allocate an array based on the numbers of possible CPUs
919-
* (Hyper-V does not support cpu online/offline).
920-
* This Array will be sparseley populated with unique
921-
* channels - primary + sub-channels.
922-
* We will however populate all the slots to evenly distribute
923-
* the load.
918+
* We allocate an array based on the number of CPU ids. This array
919+
* is initially sparsely populated for the CPUs assigned to channels:
920+
* primary + sub-channels. As I/Os are initiated by different CPUs,
921+
* the slots for all online CPUs are populated to evenly distribute
922+
* the load across all channels.
924923
*/
925-
stor_device->stor_chns = kcalloc(num_possible_cpus(), sizeof(void *),
924+
stor_device->stor_chns = kcalloc(nr_cpu_ids, sizeof(void *),
926925
GFP_KERNEL);
927926
if (stor_device->stor_chns == NULL)
928927
return -ENOMEM;

0 commit comments

Comments
 (0)