path: root/arch
diff options
authorValentin Schneider <>2021-04-29 22:53:27 -0700
committerLinus Torvalds <>2021-04-30 11:20:34 -0700
commitb22a8f7b4bde4e4ab73b64908ffd5d90ecdcdbfd (patch)
tree4abe8f4b062eb6bbec6b5dec9287c4e00e82a490 /arch
parent8b30c6256d2bddc080ac13f39363d4efbb0b292e (diff)
ia64: ensure proper NUMA distance and possible map initialization
John Paul reported a warning about bogus NUMA distance values spurred by commit: 620a6dc40754 ("sched/topology: Make sched_init_numa() use a set for the deduplicating sort") In this case, the afflicted machine comes up with a reported 256 possible nodes, all of which are 0 distance away from one another. This was previously silently ignored, but is now caught by the aforementioned commit. The culprit is ia64's node_possible_map which remains unchanged from its initialization value of NODE_MASK_ALL. In John's case, the machine doesn't have any SRAT nor SLIT table, but AIUI the possible map remains untouched regardless of what ACPI tables end up being parsed. Thus, !online && possible nodes remain with a bogus distance of 0 (distances \in [0, 9] are "reserved and have no meaning" as per the ACPI spec). Follow x86 / drivers/base/arch_numa's example and set the possible map to the parsed map, which in this case seems to be the online map. Link: Link: Fixes: 620a6dc40754 ("sched/topology: Make sched_init_numa() use a set for the deduplicating sort") Signed-off-by: Valentin Schneider <> Reported-by: John Paul Adrian Glaubitz <> Tested-by: John Paul Adrian Glaubitz <> Tested-by: Sergei Trofimovich <> Cc: "Peter Zijlstra (Intel)" <> Cc: Ingo Molnar <> Cc: Vincent Guittot <> Cc: Dietmar Eggemann <> Cc: Anatoly Pugachev <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'arch')
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index a5636524af76..e2af6b172200 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -446,7 +446,8 @@ void __init acpi_numa_fixup(void)
if (srat_num_cpus == 0) {
node_cpuid[0].phys_id = hard_smp_processor_id();
- return;
+ slit_distance(0, 0) = LOCAL_DISTANCE;
+ goto out;
@@ -489,7 +490,7 @@ void __init acpi_numa_fixup(void)
for (j = 0; j < MAX_NUMNODES; j++)
slit_distance(i, j) = i == j ?
- return;
+ goto out;
memset(numa_slit, -1, sizeof(numa_slit));
@@ -514,6 +515,8 @@ void __init acpi_numa_fixup(void)
+ node_possible_map = node_online_map;
#endif /* CONFIG_ACPI_NUMA */