Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbaAZIqJ (ORCPT ); Sun, 26 Jan 2014 03:46:09 -0500 Received: from mail-ee0-f52.google.com ([74.125.83.52]:32776 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752498AbaAZIqH (ORCPT ); Sun, 26 Jan 2014 03:46:07 -0500 Date: Sun, 26 Jan 2014 09:46:04 +0100 From: Ingo Molnar To: Yinghai Lu Cc: "H. Peter Anvin" , Linux Kernel Mailing List , Toshi Kani , Andrew Morton , Thomas Gleixner , David Rientjes , "linux-tip-commits@vger.kernel.org" Subject: Re: [tip:x86/urgent] arch/x86/mm/srat: Skip NUMA_NO_NODE while parsing SLIT Message-ID: <20140126084604.GA30853@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Yinghai Lu wrote: > On Sat, Jan 25, 2014 at 6:25 AM, tip-bot for Toshi Kani > wrote: > > Commit-ID: a85eba8814631d0d48361c8b9a7ee0984e80c03c > > Gitweb: http://git.kernel.org/tip/a85eba8814631d0d48361c8b9a7ee0984e80c03c > > Author: Toshi Kani > > AuthorDate: Tue, 21 Jan 2014 14:33:15 -0800 > > Committer: Ingo Molnar > > CommitDate: Sat, 25 Jan 2014 09:13:35 +0100 > > > > arch/x86/mm/srat: Skip NUMA_NO_NODE while parsing SLIT > > > > When ACPI SLIT table has an I/O locality (i.e. a locality > > unique to an I/O device), numa_set_distance() emits this warning > > message: > > > > 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 to unnecessary confusion. > > > > Change acpi_numa_slit_init() to avoid calling > > numa_set_distance() with NUMA_NO_NODE. > > > > Signed-off-by: Toshi Kani > > Acked-by: David Rientjes > > Signed-off-by: Andrew Morton > > Cc: Yinghai Lu > > Link: http://lkml.kernel.org/n/tip-dSvpjjvp8aMzs1ybkftxohlh@git.kernel.org > > Signed-off-by: Ingo Molnar > > --- > > arch/x86/mm/srat.c | 16 +++++++++++++--- > > 1 file changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c > > index 266ca91..5ecf651 100644 > > --- a/arch/x86/mm/srat.c > > +++ b/arch/x86/mm/srat.c > > @@ -42,15 +42,25 @@ static __init inline int srat_disabled(void) > > return acpi_numa < 0; > > } > > > > -/* Callback for SLIT parsing */ > > +/* > > + * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for > > + * I/O localities since SRAT does not list them. I/O localities are > > + * not supported at this point. > > + */ > > 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 */ > > wonder if the patch that i sent one year ago is better. > > https://lkml.org/lkml/2013/1/21/559 > > as it avoid calling extra calling of pxm_to_node(i). If it's "better" in the sense of being faster (and is otherwise equivalent functionally - assuming the original patch is bug free) then please submit it as a delta patch. (I assume the one you sent here wasn't.) Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/