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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A30BBEB64D7 for ; Fri, 16 Jun 2023 07:23:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C6B28E0001; Fri, 16 Jun 2023 03:23:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 176986B0075; Fri, 16 Jun 2023 03:23:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 064B88E0001; Fri, 16 Jun 2023 03:23:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ECDF96B0074 for ; Fri, 16 Jun 2023 03:23:27 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A49FD160AE1 for ; Fri, 16 Jun 2023 07:23:27 +0000 (UTC) X-FDA: 80907770454.06.E26739F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id E7EAF40006 for ; Fri, 16 Jun 2023 07:23:24 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o8qn+Xjl; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686900205; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=U47/p5lbH1+c+xDsapHz7ZuByXQuAeO/ec0k79C1JZc=; b=lHYnbg/fWcaej5XW/s8CSM3K4qwhkdrPCsXDkucmYLOnUhZ/TJ5yVk9tAQCVQU8rHYAp4I NRl5IalnlFOEdtqxDfcIdXTNlVYgZmJRfkoGU9/Q5LB7OA/uSU20A86qOjnA63xG8TZH4z whqNd1mMlPa0YrzHQcQthHBlsjrEhBY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o8qn+Xjl; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686900205; a=rsa-sha256; cv=none; b=CI9rXXUiCeO1fVY2fwpdkoMNI/xxrPLS/58ttQPGr0cc7/bYbSg6AGE/rvETtgoBhLuydd EWXxJ2Kr3a9UTjkPSLVj1HJ6LQnhFiO+xvJ3wLUAOHnlp+H6BCwEN0E9wX15Wnc2uWNVCV O5X38rK5JY/pg2KPO+nlDZ6viFauxhM= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F00AA6231F; Fri, 16 Jun 2023 07:23:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E18DFC433C8; Fri, 16 Jun 2023 07:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686900203; bh=3+y7L/GkTqx/QAUxlRlgLXh+T2UIJ5lInwfKENXuokw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o8qn+XjlCElPQuXotlU5yUQ1ks1s8spNQrU6wxRgDSdyYsXAmXo65777DZdk9Tfa1 nW4p9NK/WlMY4TE4C26EpIxpd1fXf1CyXS0ErDMl0T7RWTe/7AIubwfS3RmnYwhRn4 6FVJV/+fF5TfGExWwjD0bEKI0Qz1QgB4otapPIJDzedr8ddZOebWJWashXdxGYPdZf PS9AftXFdDlDTODbWIAWlULWFEu3XU+IQg11saO230APPrIJXapplhqaDKTCqiTowH tTJy0MdzwSBKZcc8omO9EzzR2YmohKXzCpJQQad3uqYh1JZB/6mnrwwSvhRC99GAI+ tkP68KEt09vJA== Date: Fri, 16 Jun 2023 10:22:47 +0300 From: Mike Rapoport To: Yajun Deng Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel test robot Subject: Re: [PATCH v2] mm: pass nid to reserve_bootmem_region() Message-ID: <20230616072247.GL52412@kernel.org> References: <20230616023011.2952211-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230616023011.2952211-1-yajun.deng@linux.dev> X-Rspamd-Queue-Id: E7EAF40006 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: uyb5qqysi5o3k39p4w85m3ttbyrbo6c6 X-HE-Tag: 1686900204-779003 X-HE-Meta: U2FsdGVkX18V9bw/IBF7JGHWJ3QhOYwqP+v8VjzDXEVW0HcVosB73JGvVvKd49+e7PZ5ybxeUDGJE4nIitdojj6Z7LAWxS1O/GYEytJTT1V9dNeKa0itX5v8JUfU22u4vxD4RorIVMboUvs5npYQUk3qMF8F9ZopWlrRAOZWWvAHcdndvZyQ+NYxMZF4tmhviITBHsgqhRB4KH6KHPx7fUX2JLUoj5HUzZB9ei8Tq1vOvyiFrVCYOSLhi+8pB0/tPevJbkjtkjqbfi3c+B74mqkXL5fwwBawOahoUMwPCE+/OZdvtNrQUXUIzRQM5IrxTjRXbqJOn2ql73ReR2JNJRrOv5oncvUYnS1Eata7iwZ3P4bIy4EhDOmoLBE8gcQYEB6nO8c0YTjKQxMoDoLPRPyq6fwEIdxuJnmqJZyOqb+iTOxT5VMAWnGaf36A3xQ95sKnRrsap2Wpl+sYCfaniJDkLV27OMKZGLezGmkpDTnZUmTsK0L7ykO0BpibpfqKrB36EuI8HNQNV+RPRaDtZvZ8pjZMLobXoOH+Edl9/86WO/WYAfDg3JGl3YCdjRQhAooTdzgOgCOWT7kPBx83QdZXdKKk+PStxDizfZUHR5Dig9xSpTMqmrEX1f/Z/6QLBoeg0nxTpkxTKRkXpa5kcDKpij3m5SYJ32blD8iS2XpXXb+wIJJ0hp/15bUMalE0thjqZoE9aRn674NKnSJvE/haMVE7BmRES7sqr4wx9n0OHNabrlNNuC0l8OjyT+u2XV3CqnvReScWrj9gnpBYzapgX5dZEsQUQe23vm7eEPc0BFOvOpQAsHvhUug3HHjIm1ojtv2USxwAmJdStV03sTxWhLeO2Vome+d5I52seFuO6/fRwBuUqmAxegEWfiyI5kSc3ZN9kiKuVq8RCHpI8IRnAuxeBZyjwRqTFU/QZSekT9vyf6g7e/H1kHNuygvHv1PspIlz72RrKecMkno Bi+ICYDT g8byUnGvDm1KsA24Fx5lwLuSeNGNtKfYJLT8BUqTpYPue+THri6c/DwHTPO6aJZGP9sz//c7DKxu8UQtEcZ1n1deQuKG0Fjeh/4Ps+ZkBmY16WxReDdxgCqXpvVq/rxUzobSTDSJfcaqkS/J2wlYtTi2NG0RgAZ1NEv8Pd90LLwNrJzgpoPFFpcGke03nr4SPwxyyf/iS17S1s0iM0PIzXoCe162aXDD550lX9d7TBj+Oj3up+xlieqc8slb+DXyqod6eAmhNw5J7ZfbV0HPb5VLCMk7hRjbugnTCXUOGus02iIkkBkK/j+U2FYp5LJjpX7xgIpXIZYJuLzyuFoKPvol2HzwOXk+rgZ1GSK3zbQnsDEm8r8beMIBYRIiX4M7bJ3uUhA778nmllwfHEGCU34lh15fymrrPyMFL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Jun 16, 2023 at 10:30:11AM +0800, Yajun Deng wrote: > early_pfn_to_nid() is called frequently in init_reserved_page(), it > returns the node id of the PFN. These PFN are probably from the same > memory region, they have the same node id. It's not necessary to call > early_pfn_to_nid() for each PFN. > > Pass nid to eserve_bootmem_region() and drop the call to > early_pfn_to_nid() in init_reserved_page(). > > The most beneficial function is memmap_init_reserved_pages() if define > CONFIG_DEFERRED_STRUCT_PAGE_INIT. > The following data was tested on x86 machine, it has 190GB RAM, > > before: > memmap_init_reserved_pages() 67ms > > after: > memmap_init_reserved_pages() 20ms > > Signed-off-by: Yajun Deng > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202306160145.juJMr3Bi-lkp@intel.com > --- > include/linux/mm.h | 3 ++- > mm/memblock.c | 9 ++++++--- > mm/mm_init.c | 31 +++++++++++++++++++------------ > 3 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 17317b1673b0..39e72ca6bf22 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -2964,7 +2964,8 @@ extern unsigned long free_reserved_area(void *start, void *end, > > extern void adjust_managed_page_count(struct page *page, long count); > > -extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end); > +extern void reserve_bootmem_region(phys_addr_t start, > + phys_addr_t end, int nid); > > /* Free the reserved page into the buddy system, so it gets managed. */ > static inline void free_reserved_page(struct page *page) > diff --git a/mm/memblock.c b/mm/memblock.c > index ff0da1858778..6dc51dc845e5 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -2091,18 +2091,21 @@ static void __init memmap_init_reserved_pages(void) > { > struct memblock_region *region; > phys_addr_t start, end; > + int nid; > u64 i; > > /* initialize struct pages for the reserved regions */ > - for_each_reserved_mem_range(i, &start, &end) > - reserve_bootmem_region(start, end); > + __for_each_mem_range(i, &memblock.reserved, NULL, NUMA_NO_NODE, > + MEMBLOCK_NONE, &start, &end, &nid) > + reserve_bootmem_region(start, end, nid); I'd prefer to see for_each_reserved_mem_region() loop here > > /* and also treat struct pages for the NOMAP regions as PageReserved */ > for_each_mem_region(region) { > if (memblock_is_nomap(region)) { > start = region->base; > end = start + region->size; > - reserve_bootmem_region(start, end); > + nid = memblock_get_region_node(region); > + reserve_bootmem_region(start, end, nid); > } > } > } > diff --git a/mm/mm_init.c b/mm/mm_init.c > index d393631599a7..1499efbebc6f 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -646,10 +646,8 @@ static inline void pgdat_set_deferred_range(pg_data_t *pgdat) > } > > /* Returns true if the struct page for the pfn is initialised */ > -static inline bool __meminit early_page_initialised(unsigned long pfn) > +static inline bool __meminit early_page_initialised(unsigned long pfn, int nid) > { > - int nid = early_pfn_to_nid(pfn); > - > if (node_online(nid) && pfn >= NODE_DATA(nid)->first_deferred_pfn) > return false; > > @@ -695,15 +693,14 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) > return false; > } > > -static void __meminit init_reserved_page(unsigned long pfn) > +static void __meminit init_reserved_page(unsigned long pfn, int nid) > { > pg_data_t *pgdat; > - int nid, zid; > + int zid; > > - if (early_page_initialised(pfn)) > + if (early_page_initialised(pfn, nid)) > return; > > - nid = early_pfn_to_nid(pfn); > pgdat = NODE_DATA(nid); > > for (zid = 0; zid < MAX_NR_ZONES; zid++) { > @@ -717,7 +714,7 @@ static void __meminit init_reserved_page(unsigned long pfn) > #else > static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} > > -static inline bool early_page_initialised(unsigned long pfn) > +static inline bool early_page_initialised(unsigned long pfn, int nid) > { > return true; > } > @@ -727,7 +724,7 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) > return false; > } > > -static inline void init_reserved_page(unsigned long pfn) > +static inline void init_reserved_page(unsigned long pfn, int nid) > { > } > #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ > @@ -738,16 +735,20 @@ static inline void init_reserved_page(unsigned long pfn) > * marks the pages PageReserved. The remaining valid pages are later > * sent to the buddy page allocator. > */ > -void __meminit reserve_bootmem_region(phys_addr_t start, phys_addr_t end) > +void __meminit reserve_bootmem_region(phys_addr_t start, > + phys_addr_t end, int nid) > { > unsigned long start_pfn = PFN_DOWN(start); > unsigned long end_pfn = PFN_UP(end); > > + if (nid == MAX_NUMNODES) > + nid = first_online_node; How can this happen? > + > for (; start_pfn < end_pfn; start_pfn++) { > if (pfn_valid(start_pfn)) { > struct page *page = pfn_to_page(start_pfn); > > - init_reserved_page(start_pfn); > + init_reserved_page(start_pfn, nid); > > /* Avoid false-positive PageTail() */ > INIT_LIST_HEAD(&page->lru); > @@ -2579,7 +2580,13 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) > void __init memblock_free_pages(struct page *page, unsigned long pfn, > unsigned int order) > { > - if (!early_page_initialised(pfn)) > + int nid = 0; > + > +#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > + nid = early_pfn_to_nid(pfn); > +#endif Wen can pass nid to memblock_free_pages, no? > + > + if (!early_page_initialised(pfn, nid)) > return; > if (!kmsan_memblock_free_pages(page, order)) { > /* KMSAN will take care of these pages. */ > -- > 2.25.1 > -- Sincerely yours, Mike.