From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by kanga.kvack.org (Postfix) with ESMTP id DE2576B003D for ; Wed, 4 Dec 2013 16:14:10 -0500 (EST) Received: by mail-pb0-f45.google.com with SMTP id rp16so24287711pbb.4 for ; Wed, 04 Dec 2013 13:14:10 -0800 (PST) Received: from g4t0017.houston.hp.com (g4t0017.houston.hp.com. [15.201.24.20]) by mx.google.com with ESMTPS id qx4si12589314pbc.45.2013.12.04.13.14.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Dec 2013 13:14:09 -0800 (PST) From: Toshi Kani Subject: [PATCH] mm, x86: Skip NUMA_NO_NODE while parsing SLIT Date: Wed, 4 Dec 2013 14:09:08 -0700 Message-Id: <1386191348-4696-1-git-send-email-toshi.kani@hp.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, Toshi Kani When ACPI SLIT table has an I/O locality (i.e. a locality unique to an I/O device), numa_set_distance() emits the warning message below. NUMA: Warning: node ids are out of bound, from=-1 to=-1 distance=10 acpi_numa_slit_init() calls numa_set_distance() with pxm_to_node(), which assumes that all localities have been parsed with SRAT previously. SRAT does not list I/O localities, where as SLIT lists all localities including I/Os. Hence, pxm_to_node() returns NUMA_NO_NODE (-1) for an I/O locality. I/O localities are not supported and are ignored today, but emitting such warning message leads unnecessary confusion. Change acpi_numa_slit_init() to avoid calling numa_set_distance() with NUMA_NO_NODE. Signed-off-by: Toshi Kani --- arch/x86/mm/srat.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 266ca91..29a2ced 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -47,10 +47,16 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) { int i, j; - for (i = 0; i < slit->locality_count; i++) - for (j = 0; j < slit->locality_count; j++) + for (i = 0; i < slit->locality_count; i++) { + if (pxm_to_node(i) == NUMA_NO_NODE) + continue; + for (j = 0; j < slit->locality_count; j++) { + if (pxm_to_node(j) == NUMA_NO_NODE) + continue; numa_set_distance(pxm_to_node(i), pxm_to_node(j), slit->entry[slit->locality_count * i + j]); + } + } } /* Callback for Proximity Domain -> x2APIC mapping */ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org