From nobody Sat Feb 7 18:15:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83FBFEB64DA for ; Mon, 19 Jun 2023 02:34:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229796AbjFSCea (ORCPT ); Sun, 18 Jun 2023 22:34:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbjFSCe2 (ORCPT ); Sun, 18 Jun 2023 22:34:28 -0400 Received: from out-34.mta1.migadu.com (out-34.mta1.migadu.com [95.215.58.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13E8F116 for ; Sun, 18 Jun 2023 19:34:27 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687142065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=oVQbxjpuybR0tDH9ddBEqcix10WINBbUnDacUemPWWA=; b=Mn0IXsSF0w1YIqlm5F+yQWMVV4RZqBO5LgK1xOC66NLlKvuf4FZdDHF9JB7cnIVUAC1Vk5 I51mMpf4cNHS3ZgZ/PvIOeTojrmPt7TuNwHY/RByoqyXtLxyLemfKimVYOB5L5jSR4qWSE FDk2p6b9errHejR2r9GD1BazcIA9lEY= From: Yajun Deng To: akpm@linux-foundation.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng , kernel test robot Subject: [PATCH v4] mm: pass nid to reserve_bootmem_region() Date: Mon, 19 Jun 2023 10:34:06 +0800 Message-Id: <20230619023406.424298-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 reserve_bootmem_region() and drop the call to early_pfn_to_nid() in init_reserved_page(). Also, set nid on all reserved pages before doing this, as some reserved memory regions may not be set nid. The most beneficial function is memmap_init_reserved_pages() if CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled. The following data was tested on an x86 machine with 190GB of 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@int= el.com Reviewed-by: Mike Rapoport (IBM) --- V3 -> V4: make the test for early_page_initialised() inside if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) V2 -> V3: set nid on all reserved pages before pass nid. V1 -> V2: fix build error when CONFIG_NUMA is not enabled. --- include/linux/mm.h | 3 ++- mm/memblock.c | 31 +++++++++++++++++++++---------- mm/mm_init.c | 30 +++++++++++++++++------------- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index fdd966b11f79..a7a0e692d44d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2960,7 +2960,8 @@ extern unsigned long free_reserved_area(void *start, = void *end, =20 extern void adjust_managed_page_count(struct page *page, long count); =20 -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); =20 /* 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..f9e61e565a53 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2091,19 +2091,30 @@ static void __init memmap_init_reserved_pages(void) { struct memblock_region *region; phys_addr_t start, end; - u64 i; + int nid; + + /* + * set nid on all reserved pages and also treat struct + * pages for the NOMAP regions as PageReserved + */ + for_each_mem_region(region) { + nid =3D memblock_get_region_node(region); + start =3D region->base; + end =3D start + region->size; + + if (memblock_is_nomap(region)) + reserve_bootmem_region(start, end, nid); + + memblock_set_node(start, end, &memblock.reserved, nid); + } =20 /* initialize struct pages for the reserved regions */ - for_each_reserved_mem_range(i, &start, &end) - reserve_bootmem_region(start, end); + for_each_reserved_mem_region(region) { + nid =3D memblock_get_region_node(region); + start =3D region->base; + end =3D start + region->size; =20 - /* and also treat struct pages for the NOMAP regions as PageReserved */ - for_each_mem_region(region) { - if (memblock_is_nomap(region)) { - start =3D region->base; - end =3D start + region->size; - reserve_bootmem_region(start, end); - } + reserve_bootmem_region(start, end, nid); } } =20 diff --git a/mm/mm_init.c b/mm/mm_init.c index d393631599a7..a1963c3322af 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) } =20 /* 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 =3D early_pfn_to_nid(pfn); - if (node_online(nid) && pfn >=3D NODE_DATA(nid)->first_deferred_pfn) return false; =20 @@ -695,15 +693,14 @@ defer_init(int nid, unsigned long pfn, unsigned long = end_pfn) return false; } =20 -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; =20 - if (early_page_initialised(pfn)) + if (early_page_initialised(pfn, nid)) return; =20 - nid =3D early_pfn_to_nid(pfn); pgdat =3D NODE_DATA(nid); =20 for (zid =3D 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) {} =20 -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 pf= n, unsigned long end_pfn) return false; } =20 -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,7 +735,8 @@ 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 =3D PFN_DOWN(start); unsigned long end_pfn =3D PFN_UP(end); @@ -747,7 +745,7 @@ void __meminit reserve_bootmem_region(phys_addr_t start= , phys_addr_t end) if (pfn_valid(start_pfn)) { struct page *page =3D pfn_to_page(start_pfn); =20 - init_reserved_page(start_pfn); + init_reserved_page(start_pfn, nid); =20 /* Avoid false-positive PageTail() */ INIT_LIST_HEAD(&page->lru); @@ -2579,8 +2577,14 @@ void __init set_dma_reserve(unsigned long new_dma_re= serve) void __init memblock_free_pages(struct page *page, unsigned long pfn, unsigned int order) { - if (!early_page_initialised(pfn)) - return; + + if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { + int nid =3D early_pfn_to_nid(pfn); + + if (!early_page_initialised(pfn, nid)) + return; + } + if (!kmsan_memblock_free_pages(page, order)) { /* KMSAN will take care of these pages. */ return; --=20 2.25.1