x86, mm: Skip unknown PXM early in SLIT parsing
PATCH 1/1 x86, mm: Skip unknown PXM early in SLIT parsing
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(-)
arch/x86/mm/srat.c +14 -3
@@ -46,11 +46,22 @@ static __init inline int srat_disabled(vvoid __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 */