From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755417AbZIRQ2l (ORCPT ); Fri, 18 Sep 2009 12:28:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755328AbZIRQ2l (ORCPT ); Fri, 18 Sep 2009 12:28:41 -0400 Received: from hera.kernel.org ([140.211.167.34]:33643 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755265AbZIRQ2j (ORCPT ); Fri, 18 Sep 2009 12:28:39 -0400 Message-ID: <4AB3B4F5.6080809@kernel.org> Date: Fri, 18 Sep 2009 09:27:33 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: David Rientjes CC: Suresh Jayaram , Ingo Molnar , Andrew Morton , mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Jesse Barnes , Jesse Brandeburg Subject: Re: mmotm 2009-09-09-22-56 uploaded References: <200909100601.n8A61Eju002109@imap1.linux-foundation.org> <38c3c4860909132302j3fd7afe1p984b91d74eb1d782@mail.gmail.com> <38c3c4860909150320qc4a203eu7552294ef0aafd2c@mail.gmail.com> <38c3c4860909180238x7c9f305dsbce1492e2018c5a5@mail.gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org David Rientjes wrote: > On Fri, 18 Sep 2009, David Rientjes wrote: > >> This seems to be related to 2547089 "x86/PCI: initialize PCI bus node >> numbers early" since cpumask_of_pcibus() on x86 doesn't check for -1 >> pcibus_to_node() like most other architectures. It'll simply index into >> cpumask_of_node for whatever the pci_sysdata's node is, and in this case >> that's -1. >> > > Suresh, could you give this patch a try? It turns out that the > mp_bus_to_node map simply leaves all busses that don't have memory > affinity to -1, so cpu_online_mask is actually the appropriate cpumask to > return and x86 doesn't catch this. > > > x86: default pcibus cpumask to all cpus if it lacks affinity > > The early initialization of the pci bus to node mapping leaves all busses > with a node id of -1 if it lacks memory affinity. Thus, cpumask_of_pcibus > must return all online cpus for such busses. > > Signed-off-by: David Rientjes > --- > arch/x86/include/asm/pci.h | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -143,7 +143,11 @@ static inline int __pcibus_to_node(const struct pci_bus *bus) > static inline const struct cpumask * > cpumask_of_pcibus(const struct pci_bus *bus) > { > - return cpumask_of_node(__pcibus_to_node(bus)); > + int node; > + > + node = __pcibus_to_node(bus); > + return (node == -1) ? cpu_online_mask : > + cpumask_of_node(node); > } > #endif > looks right, but we should use nearby_node or local cpu node instead of cpu_online_mask... YH