Skip to content

Commit 4f6b64f

Browse files
mhklinuxliuw
authored andcommitted
iommu/hyper-v: Don't assume cpu_possible_mask is dense
Current code gets the APIC IDs for CPUs numbered 255 and lower. This code assumes cpu_possible_mask is dense, which is not true in the general case per [1]. If cpu_possible_mask contains holes, num_possible_cpus() is less than nr_cpu_ids, so some CPUs might get skipped. Furthermore, getting the APIC ID of a CPU that isn't in cpu_possible_mask is invalid. However, the configurations that Hyper-V provides to guest VMs on x86 hardware, in combination with how x86 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 determine the range to scan based on nr_cpu_ids, and skip any CPUs that are not in the cpu_possible_mask. [1] https://lore.kernel.org/lkml/SN6PR02MB4157210CC36B2593F8572E5ED4692@SN6PR02MB4157.namprd02.prod.outlook.com/ Signed-off-by: Michael Kelley <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Wei Liu <[email protected]> Message-ID: <[email protected]>
1 parent 16b18fd commit 4f6b64f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/iommu/hyperv-iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ static int __init hyperv_prepare_irq_remapping(void)
164164
* max cpu affinity for IOAPIC irqs. Scan cpu 0-255 and set cpu
165165
* into ioapic_max_cpumask if its APIC ID is less than 256.
166166
*/
167-
for (i = min_t(unsigned int, num_possible_cpus() - 1, 255); i >= 0; i--)
168-
if (cpu_physical_id(i) < 256)
167+
for (i = min_t(unsigned int, nr_cpu_ids - 1, 255); i >= 0; i--)
168+
if (cpu_possible(i) && cpu_physical_id(i) < 256)
169169
cpumask_set_cpu(i, &ioapic_max_cpumask);
170170

171171
return 0;

0 commit comments

Comments
 (0)