x86_64: not set node to cpu_to_node if the node is not online
PATCH 1/1 x86_64: not set node to cpu_to_node if the node is not online
numa_init_array will set round-bin to all cpu to online nodes. init_cpu_to_node will use cpu->apic (from MADT or mptable) and apic->node(from SRAT or AMD config space with k8_bus_64.c) to have cpu->node mapping. and later identify_cpu will overwrite them again...(with nearby_node...)
this patch will check if the node is online, otherwise will not update cpu_node map. so keep cpu_node map to online node before identify_cpu..., to prevent possible error.
Signed-off-by Yinghai Lu <[email protected]>
arch/x86/mm/numa_64.c +6 -2
@@ -622,13 +622,17 @@ void __init init_cpu_to_node(void)int i;for (i =0 ; i <NR_CPUS ; i++) { +int node;u16 apicid = x86_cpu_to_apicid_init[i];if (apicid ==BAD_APICID )continue ; -if (apicid_to_node[apicid] ==NUMA_NO_NODE ) + node = apicid_to_node[apicid]; +if (node ==NUMA_NO_NODE )continue ; -numa_set_node (i, apicid_to_node[apicid]); +if (!node_online (node)) +continue ; +numa_set_node (i, node); } }