Some systems one bios could support 2 sockets and 4 sockets, and SLIT is the same, aka 4x4.
For 2 sockets configuration, SRAT will only have PXM0 and PXM2. So we will get warning: NUMA: Warning: node ids are out of bound, from=0 to=-1 distance=15 Need to skip PXM1 and PXM2 as there is no responding node, To avoid uncorrect warning. Signed-off-by: Yinghai Lu <[email protected]> --- arch/x86/mm/srat.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) Index: linux-2.6/arch/x86/mm/srat.c =================================================================== --- linux-2.6.orig/arch/x86/mm/srat.c +++ linux-2.6/arch/x86/mm/srat.c @@ -46,11 +46,22 @@ static __init inline int srat_disabled(v void __init acpi_numa_slit_init(struct acpi_table_slit *slit) { int i, j; + int from_node, to_node; - for (i = 0; i < slit->locality_count; i++) - for (j = 0; j < slit->locality_count; j++) - numa_set_distance(pxm_to_node(i), pxm_to_node(j), + for (i = 0; i < slit->locality_count; i++) { + from_node = pxm_to_node(i); + if (from_node < 0) + continue; /* skip unknown PXM */ + + for (j = 0; j < slit->locality_count; j++) { + to_node = pxm_to_node(j); + if (to_node < 0) + continue; /* skip unknown PXM */ + + numa_set_distance(from_node, to_node, slit->entry[slit->locality_count * i + j]); + } + } } /* Callback for Proximity Domain -> x2APIC mapping */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
