Skip to content

Commit 79fd8e7

Browse files
vittyvkgregkh
authored andcommitted
Drivers: hv: vmbus: avoid infinite loop in init_vp_index()
When we pick a CPU to use for a new subchannel we try find a non-used one on the appropriate NUMA node, we keep track of them with the primary->alloced_cpus_in_node mask. Under normal circumstances we don't run out of available CPUs but it is possible when we we don't initialize some cpus in Linux, e.g. when we boot with 'nr_cpus=' limitation. Avoid the infinite loop in init_vp_index() by checking that we still have non-used CPUs in the alloced_cpus_in_node mask and resetting it in case we don't. Signed-off-by: Vitaly Kuznetsov <[email protected]> Signed-off-by: K. Y. Srinivasan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 50fe6dd commit 79fd8e7

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/hv/channel_mgmt.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,17 @@ static void init_vp_index(struct vmbus_channel *channel, u16 dev_type)
549549
cpumask_of_node(primary->numa_node));
550550

551551
cur_cpu = -1;
552+
553+
/*
554+
* Normally Hyper-V host doesn't create more subchannels than there
555+
* are VCPUs on the node but it is possible when not all present VCPUs
556+
* on the node are initialized by guest. Clear the alloced_cpus_in_node
557+
* to start over.
558+
*/
559+
if (cpumask_equal(&primary->alloced_cpus_in_node,
560+
cpumask_of_node(primary->numa_node)))
561+
cpumask_clear(&primary->alloced_cpus_in_node);
562+
552563
while (true) {
553564
cur_cpu = cpumask_next(cur_cpu, &available_mask);
554565
if (cur_cpu >= nr_cpu_ids) {

0 commit comments

Comments
 (0)