From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4F41C433E2 for ; Sun, 30 Aug 2020 02:56:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90E40206B5 for ; Sun, 30 Aug 2020 02:56:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="wUjJW7du"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="jtwZ/v6p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90E40206B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID:Subject:To:From: Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=lC/qEuFyRrtNjBhM0m8/kZ7ig4rlc2Dz1DIwfhLi4Hk=; b=wUjJW7dubXIzh7Ok9YNtqpsSV y+HY3jYebZhwLtNToJJWU5qUfvgDAiPfXWEqS8hDSnvHE/A1I5j1q/lpTrgRqSY0+kJESkUqr57lB izOkCkUQxXBS5DOUwTe/6E2qReAhKEPtomVRzUHBn56UZz/2RgTN/b6nUF2Zpw/F6hwLcrvvPaJ9R fjbiMgpJ1+LzjGP3doyM911V3h1N6pVvtuzKfr/PSQCRYGuFtESLCv1U9v5LmcZ3y2sFFaA/+NECd rbYZQFkpQWa9J4kuK8uNN80/7uTKtWzxNX+ewUSPXZdIxSQU0XvhzISL3mPbn13JDmUjbxSbyVKEZ 1nYhF06Kg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCDUU-0003kx-Tr; Sun, 30 Aug 2020 02:54:46 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCDUS-0003kV-4q; Sun, 30 Aug 2020 02:54:45 +0000 Received: from localhost (113.sub-72-107-119.myvzw.com [72.107.119.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9897D2075B; Sun, 30 Aug 2020 02:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598756081; bh=Z3utoNDrOsl5rBfHIimSAKozg7AYBP8nGpqxszM//w0=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=jtwZ/v6p2sVfweeOXgXlYs5Vnq9wMh10kTQjajvH7IdOshWMhSKCj27bkwKMpHy+J Qk7+qfwS1qADtdTbFQaqgVtbf2ylygBfMX7uq6EJiNYEWaOw9HbZh5aCjfBoUbi0/f nZknlBe/Q7GsLWKnLGQJ0kDtulxaxEznfsmvVgm8= Date: Sat, 29 Aug 2020 21:54:38 -0500 From: Bjorn Helgaas To: Atish Patra Subject: Re: [RFC/RFT PATCH 3/6] arm64, numa: Move pcibus_to_node definition to generic numa code Message-ID: <20200830025438.GA9624@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200829_225444_395573_C85A5D13 X-CRM114-Status: GOOD ( 40.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rafael J. Wysocki" , Catalin Marinas , Jonathan Cameron , Atish Patra , Zong Li , linux-riscv , Will Deacon , linux-arch@vger.kernel.org, Rob Herring , Lorenzo Pieralisi , Ganapatrao Kulkarni , Steven Price , linux-pci@vger.kernel.org, Greentime Hu , Albert Ou , Arnd Bergmann , Anshuman Khandual , Paul Walmsley , Bjorn Helgaas , "linux-arm-kernel@lists.infradead.org" , Nick Hu , Greg Kroah-Hartman , Anup Patel , "linux-kernel@vger.kernel.org List" , Palmer Dabbelt , Andrew Morton , Mike Rapoport Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Aug 28, 2020 at 06:11:50PM -0700, Atish Patra wrote: > On Fri, Aug 28, 2020 at 9:15 AM Bjorn Helgaas wrote: > > On Fri, Aug 28, 2020 at 10:48:30AM +0100, Jonathan Cameron wrote: > > > On Fri, 14 Aug 2020 14:47:22 -0700 > > > Atish Patra wrote: > > > > > > > pcibus_to_node is used only when numa is enabled and does not depend > > > > on ISA. Thus, it can be moved the generic numa implementation. > > > > > > > > Signed-off-by: Atish Patra > > > > > > From a more general unification point of view, there seem to > > > be two ways architectures implement this. > > > Either > > > > > > bus->sysdata.node > > > > > > Or as here. > > > There are weird other options, but let us ignore those :) > > > > > > That is going to take a bit of unwinding should we > > > want to take this unification further and perhaps we want to think > > > about doing this in pci generic code rather than here? > > > > > > Perhaps this is one we are better keeping architecture specific for > > > now? > > > > > > +CC Bjorn and Linux-pci > > > > > > > > > > --- > > > > arch/arm64/kernel/pci.c | 10 ---------- > > > > drivers/base/arch_numa.c | 11 +++++++++++ > > > > 2 files changed, 11 insertions(+), 10 deletions(-) > > > > > > > > diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c > > > > index 1006ed2d7c60..07c122946c11 100644 > > > > --- a/arch/arm64/kernel/pci.c > > > > +++ b/arch/arm64/kernel/pci.c > > > > @@ -54,16 +54,6 @@ int raw_pci_write(unsigned int domain, unsigned int bus, > > > > return b->ops->write(b, devfn, reg, len, val); > > > > } > > > > > > > > -#ifdef CONFIG_NUMA > > > > - > > > > -int pcibus_to_node(struct pci_bus *bus) > > > > -{ > > > > - return dev_to_node(&bus->dev); > > > > -} > > > > -EXPORT_SYMBOL(pcibus_to_node); > > > > - > > > > -#endif > > > > - > > > > #ifdef CONFIG_ACPI > > > > > > > > struct acpi_pci_generic_root_info { > > > > diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c > > > > index 83341c807240..4ab1b20a615d 100644 > > > > --- a/drivers/base/arch_numa.c > > > > +++ b/drivers/base/arch_numa.c > > > > @@ -11,6 +11,7 @@ > > > > #include > > > > #include > > > > #include > > > > +#include > > > > #include > > > > > > > > #ifdef CONFIG_ARM64 > > > > @@ -60,6 +61,16 @@ EXPORT_SYMBOL(cpumask_of_node); > > > > > > > > #endif > > > > > > > > +#ifdef CONFIG_PCI > > > > + > > > > +int pcibus_to_node(struct pci_bus *bus) > > > > +{ > > > > + return dev_to_node(&bus->dev); > > > > +} > > > > +EXPORT_SYMBOL(pcibus_to_node); > > > > + > > > > +#endif > > > > I certainly agree that this should not be arch-specific, but I'm not > > really in favor of adding this PCI gunk in drivers/base. > > > > I think we can do better (eventually) by getting rid of > > pcibus_to_node() completely. It's not used very much except by > > cpumask_of_pcibus(), which itself is hardly used at all. > > > I am a bit confused here. A quick grep suggested that pcibus_to_node() > is also called from generic pci probe, > controller and few drivers(block, infiniband) as well. Maybe I am > missing something here ? I didn't say it was *only* used by cpumask_of_pcibus(). 13 of the 29 calls are from cpumask_of_pcibus(). As you point out, there are a few drivers that use it. They typically have a pci_dev, so they do the equivalent of pcibus_to_node(pdev->bus). That seems silly; they should just do dev_to_node(&pdev->dev) instead. I looked at this once, and it seems like there might have been a wrinkle like the pdev->dev node not being set correctly or something. If that's the case, I think it should be fixed. > We can move the pcibus_to_node to arch specific code for now if that's > what is preferred. Now I'm the one who's confused :) Most arches, including arm64, already have arch-specific implementations of pcibus_to_node(). I didn't look at the rest of the series to see if there's a reason you need to move pcibus_to_node() from arch/arm64/kernel/pci.c to drivers//base/arch_numa.c. If you don't need to, I would just leave it where it is. > > > > static void numa_update_cpu(unsigned int cpu, bool remove) > > > > { > > > > int nid = cpu_to_node(cpu); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel