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=-2.5 required=3.0 tests=MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 2905BC43334 for ; Thu, 6 Sep 2018 08:41:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E06072075B for ; Thu, 6 Sep 2018 08:41:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E06072075B 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-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728241AbeIFNP4 (ORCPT ); Thu, 6 Sep 2018 09:15:56 -0400 Received: from mx2.suse.de ([195.135.220.15]:39800 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728127AbeIFNP4 (ORCPT ); Thu, 6 Sep 2018 09:15:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 01CB6AE60; Thu, 6 Sep 2018 08:41:31 +0000 (UTC) Date: Thu, 6 Sep 2018 10:41:31 +0200 From: Michal Hocko To: Mike Rapoport Cc: linux-mm@kvack.org, Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Ingo Molnar , Michael Ellerman , Paul Burton , Thomas Gleixner , Tony Luck , linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH 17/29] memblock: replace alloc_bootmem_node with memblock_alloc_node Message-ID: <20180906084131.GB14951@dhcp22.suse.cz> References: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> <1536163184-26356-18-git-send-email-rppt@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1536163184-26356-18-git-send-email-rppt@linux.vnet.ibm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed 05-09-18 18:59:32, Mike Rapoport wrote: > Signed-off-by: Mike Rapoport ENOCHAGELOG again The conversion itself looks good to me Acked-by: Michal Hocko > --- > arch/alpha/kernel/pci_iommu.c | 4 ++-- > arch/ia64/sn/kernel/io_common.c | 7 ++----- > arch/ia64/sn/kernel/setup.c | 4 ++-- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c > index 6923b0d..b52d76f 100644 > --- a/arch/alpha/kernel/pci_iommu.c > +++ b/arch/alpha/kernel/pci_iommu.c > @@ -74,7 +74,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, > > #ifdef CONFIG_DISCONTIGMEM > > - arena = alloc_bootmem_node(NODE_DATA(nid), sizeof(*arena)); > + arena = memblock_alloc_node(sizeof(*arena), align, nid); > if (!NODE_DATA(nid) || !arena) { > printk("%s: couldn't allocate arena from node %d\n" > " falling back to system-wide allocation\n", > @@ -82,7 +82,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, > arena = alloc_bootmem(sizeof(*arena)); > } > > - arena->ptes = __alloc_bootmem_node(NODE_DATA(nid), mem_size, align, 0); > + arena->ptes = memblock_alloc_node(sizeof(*arena), align, nid); > if (!NODE_DATA(nid) || !arena->ptes) { > printk("%s: couldn't allocate arena ptes from node %d\n" > " falling back to system-wide allocation\n", > diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c > index 102aaba..8b05d55 100644 > --- a/arch/ia64/sn/kernel/io_common.c > +++ b/arch/ia64/sn/kernel/io_common.c > @@ -385,16 +385,13 @@ void __init hubdev_init_node(nodepda_t * npda, cnodeid_t node) > { > struct hubdev_info *hubdev_info; > int size; > - pg_data_t *pg; > > size = sizeof(struct hubdev_info); > > if (node >= num_online_nodes()) /* Headless/memless IO nodes */ > - pg = NODE_DATA(0); > - else > - pg = NODE_DATA(node); > + node = 0; > > - hubdev_info = (struct hubdev_info *)alloc_bootmem_node(pg, size); > + hubdev_info = (struct hubdev_info *)memblock_alloc_node(size, 0, node); > > npda->pdinfo = (void *)hubdev_info; > } > diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c > index 5f6b6b4..ab2564f 100644 > --- a/arch/ia64/sn/kernel/setup.c > +++ b/arch/ia64/sn/kernel/setup.c > @@ -511,7 +511,7 @@ static void __init sn_init_pdas(char **cmdline_p) > */ > for_each_online_node(cnode) { > nodepdaindr[cnode] = > - alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); > + memblock_alloc_node(sizeof(nodepda_t), 0, cnode); > memset(nodepdaindr[cnode]->phys_cpuid, -1, > sizeof(nodepdaindr[cnode]->phys_cpuid)); > spin_lock_init(&nodepdaindr[cnode]->ptc_lock); > @@ -522,7 +522,7 @@ static void __init sn_init_pdas(char **cmdline_p) > */ > for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) > nodepdaindr[cnode] = > - alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); > + memblock_alloc_node(sizeof(nodepda_t), 0, 0); > > /* > * Now copy the array of nodepda pointers to each nodepda. > -- > 2.7.4 > -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Hocko Date: Thu, 06 Sep 2018 08:41:31 +0000 Subject: Re: [RFC PATCH 17/29] memblock: replace alloc_bootmem_node with memblock_alloc_node Message-Id: <20180906084131.GB14951@dhcp22.suse.cz> List-Id: References: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> <1536163184-26356-18-git-send-email-rppt@linux.vnet.ibm.com> In-Reply-To: <1536163184-26356-18-git-send-email-rppt@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Mike Rapoport Cc: linux-mm@kvack.org, Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Ingo Molnar , Michael Ellerman , Paul Burton , Thomas Gleixner , Tony Luck , linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org On Wed 05-09-18 18:59:32, Mike Rapoport wrote: > Signed-off-by: Mike Rapoport ENOCHAGELOG again The conversion itself looks good to me Acked-by: Michal Hocko > --- > arch/alpha/kernel/pci_iommu.c | 4 ++-- > arch/ia64/sn/kernel/io_common.c | 7 ++----- > arch/ia64/sn/kernel/setup.c | 4 ++-- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c > index 6923b0d..b52d76f 100644 > --- a/arch/alpha/kernel/pci_iommu.c > +++ b/arch/alpha/kernel/pci_iommu.c > @@ -74,7 +74,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, > > #ifdef CONFIG_DISCONTIGMEM > > - arena = alloc_bootmem_node(NODE_DATA(nid), sizeof(*arena)); > + arena = memblock_alloc_node(sizeof(*arena), align, nid); > if (!NODE_DATA(nid) || !arena) { > printk("%s: couldn't allocate arena from node %d\n" > " falling back to system-wide allocation\n", > @@ -82,7 +82,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, > arena = alloc_bootmem(sizeof(*arena)); > } > > - arena->ptes = __alloc_bootmem_node(NODE_DATA(nid), mem_size, align, 0); > + arena->ptes = memblock_alloc_node(sizeof(*arena), align, nid); > if (!NODE_DATA(nid) || !arena->ptes) { > printk("%s: couldn't allocate arena ptes from node %d\n" > " falling back to system-wide allocation\n", > diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c > index 102aaba..8b05d55 100644 > --- a/arch/ia64/sn/kernel/io_common.c > +++ b/arch/ia64/sn/kernel/io_common.c > @@ -385,16 +385,13 @@ void __init hubdev_init_node(nodepda_t * npda, cnodeid_t node) > { > struct hubdev_info *hubdev_info; > int size; > - pg_data_t *pg; > > size = sizeof(struct hubdev_info); > > if (node >= num_online_nodes()) /* Headless/memless IO nodes */ > - pg = NODE_DATA(0); > - else > - pg = NODE_DATA(node); > + node = 0; > > - hubdev_info = (struct hubdev_info *)alloc_bootmem_node(pg, size); > + hubdev_info = (struct hubdev_info *)memblock_alloc_node(size, 0, node); > > npda->pdinfo = (void *)hubdev_info; > } > diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c > index 5f6b6b4..ab2564f 100644 > --- a/arch/ia64/sn/kernel/setup.c > +++ b/arch/ia64/sn/kernel/setup.c > @@ -511,7 +511,7 @@ static void __init sn_init_pdas(char **cmdline_p) > */ > for_each_online_node(cnode) { > nodepdaindr[cnode] > - alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t)); > + memblock_alloc_node(sizeof(nodepda_t), 0, cnode); > memset(nodepdaindr[cnode]->phys_cpuid, -1, > sizeof(nodepdaindr[cnode]->phys_cpuid)); > spin_lock_init(&nodepdaindr[cnode]->ptc_lock); > @@ -522,7 +522,7 @@ static void __init sn_init_pdas(char **cmdline_p) > */ > for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) > nodepdaindr[cnode] > - alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); > + memblock_alloc_node(sizeof(nodepda_t), 0, 0); > > /* > * Now copy the array of nodepda pointers to each nodepda. > -- > 2.7.4 > -- Michal Hocko SUSE Labs