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 3D82DEB64D7 for ; Sun, 18 Jun 2023 08:25:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D4576B0071; Sun, 18 Jun 2023 04:25:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 787316B0072; Sun, 18 Jun 2023 04:25:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6750F6B0075; Sun, 18 Jun 2023 04:25:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5888A6B0071 for ; Sun, 18 Jun 2023 04:25:29 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1BA90120DE1 for ; Sun, 18 Jun 2023 08:25:29 +0000 (UTC) X-FDA: 80915184378.26.F93E188 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 6B873C0002 for ; Sun, 18 Jun 2023 08:25:26 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CNqMmNkw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf10.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=1687076726; 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=esO8VXG1w4nG7Z18CUPNVck3Cn9mH5Pnl/IGMkAcPrI=; b=q6T5kBRkduaE2iYX3OR+fJ5xhNujKr/STE9nEA/0ZmFbWO0vLz2o0yfsquGqelpoNXrNQA IE/aHtyFVYph9SsLPpUBA4mSXHu6oxEuWdZe5gezLArsRPjV8tTf4x92o54aL2Qa+2Mc2o 42aMoAu1egKl5SphNB1XbMH+ScGoYgo= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CNqMmNkw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf10.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=1687076726; a=rsa-sha256; cv=none; b=YKt18B13MrJrQy19HnxaQ5x5UPElG4FECwwOXkNak54ihseAdTRzHXE+bHkIsCxqooJ8b4 Zoy8Cd5j9TrtQgKvSMODjZC1B3K06nMX/2G+z0WzSzbFhnHKZ9r2MkE9bMsjthxDqkGzbO QoT0U8ssi/iCEnigVl98LFj08YcDpuo= 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 73D9160B2C; Sun, 18 Jun 2023 08:25:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1918C433C0; Sun, 18 Jun 2023 08:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687076724; bh=M80Ff1YaeCaOLCW/e4K/1ANMMVMvU/StnWvOxNQFr9k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CNqMmNkwiNDq/IsDK5Mwos4nbbrk/A/06OBVOt+J8GJq0LaDU4pBofGinhydpmGuz 96I9rFt6nS3o+QCrPkFThFLvn5v47MZLdTVGNFfdhfWZ5O1p6IqC/1djzOszKM9XK2 RvnDraCZ8KxJwznZdNSoG2iGl0w8055EVCBFooTN2OPTCcoxMAx20sS7ato7Pi2A1Z zwGNAhJHkwt8vPzsqm/XLMxAuof0mzDhRLVi4ILiWd1BtHTTiboeDZuxV1F67TB6Va BfbA6mxX0AlDXQdEG7HAv+KgzZAjv4Zs0ZxiijtFcrHH2DSBKFsaPio567kqxe5Uru Quf3gwRZzk/Ig== Date: Sun, 18 Jun 2023 11:24:46 +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 v3] mm: pass nid to reserve_bootmem_region() Message-ID: <20230618082446.GB52412@kernel.org> References: <20230618053000.2930604-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230618053000.2930604-1-yajun.deng@linux.dev> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6B873C0002 X-Stat-Signature: a98yor1kan8hkqt585ydhe7w9yf47i8b X-Rspam-User: X-HE-Tag: 1687076726-583281 X-HE-Meta: U2FsdGVkX18Olpq4UQocSJxH8H3veUs+jbvYORVYuwkiexFzlK2AfT/LptDUDK7wsTEeg93ybaYzQ5UegTjZolMxqCgduwah0pT4Yqr2G1vF5B7+nK4J1CAmM56TfUr9Njapje74qj1L1c7fhujz0mAKSilXqkaaaoEFEkI9SEMCRcB/pJvci5mA4Q/ibQ3BzPgErfNvsVUOk9onVVXndespSEtMcadpx1UUwvNYDJ0K2x76FDzQrRi4cO3HRt4bIvDjD+e42l6BmNPsKnBCUhvh6fAvrOOOBDVK93NLhauEpbJvRaVHhF1G7MkZMll+UQO1GelYhK8ff8hBy69gA3IpacUjqM01ZPqGNGAkgJ05IQq2sy5X0Kxdao/NNbfiSohYqmR4V0LjvpKpDtPB22H1bahyFFhiz67cAS5P+O57maGPKn5IhuwN6PHZ9rI8HEDwXg9OeXiA6okSWDg6zt/C92J0nD39CPbNt1eQpQSoTgM2p7W8a1VwTGN3MLwGganeLWgZHO1X9mUbdw4LRYgGqQKp6L8+AqVcd5frQoAYLJ7+Qo/wqp5RKNc32MPJnChDWxXK6wyIROLC5Vh4R5bFb6DZu9WTJfjKqWMGf/f2iXQQ/d4OxM/qH3NFioGvAuytw5pzQPdC8quXWFXCA/H7Cw09EOwAv+FUFnZmh9SLZTUlZB297icMO1lJBVAKYs712YJ5qEgiHiG8+gaZp3SLW1W5B1GlAu3JQhto0BiOkA8eTglVdkf2yKBhys6tZ8qV46P2iZatTYmLyboWhArjtF4aMd4ocjrmDm1fmC1YKM2s0DMNQR6S3Pqe+R2x1HnKWyhvBxsoNZ2M1MOXJ81QVtavOiLbxVPCtM0TCuznFLPxCzCKW8rJwxVGLCti3lapCiIjmzBrn2F/vhNRONC1y3F1tDbF2bK6w4NB1fJ8SZW3EUWlxTiV5SgBysvRwQ+vFilTMbe9iPdfx8k SpxnwvXO jN4Y9daqcsfp6NtpFCid72SrM+H4/qGAmYCkGdjI+MD0DsGoFARuur4NGFQEraJUhtfeRM+6dQWwbmyNV4y28g2da5CMLHKbJ+Nms41U+P1xQprDenGNGXFIf0W4BJmMPfa63bOAQd9hBXIHqzlmJ8OKPm8R1lyXDMz+OEerJWg1Az7u1DoGvezagmgsXFgMrcXTnpvNr+2UfEu0OLdni6jLzmlh/X3WXSbHm6GiV/1AGREwODCYN+Uy1bwROdzLM9JxvMQpeLlW2QZP9z8Zrgdqhzbjv9rjKInhU56mSSPKxOFwt5t/yKqkXwhAYA6Ea8hCBERuw2W7HdCDEkTnSphIBxU15UmEh/VEc2ZvJ4dgrcZ5qyECFAwOI2oRxXSXj2HWaS0FAsPTNCJZVV6XI/geGpgQVS30Hyawr94KXTirUPUOQ9gg/rMrW58yJJlhWmVxL 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 Sun, Jun 18, 2023 at 01:30:00PM +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 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@intel.com For the future postings please add a patch changelog explaining difference against previous submission (https://docs.kernel.org/process/submitting-patches.html#respond-to-review-comments) > --- > include/linux/mm.h | 3 ++- > mm/memblock.c | 31 +++++++++++++++++++++---------- > mm/mm_init.c | 27 +++++++++++++++------------ > 3 files changed, 38 insertions(+), 23 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, > > 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..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 = memblock_get_region_node(region); > + start = region->base; > + end = start + region->size; > + > + if (memblock_is_nomap(region)) > + reserve_bootmem_region(start, end, nid); > + > + memblock_set_node(start, end, &memblock.reserved, nid); > + } > > /* 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 = memblock_get_region_node(region); > + start = region->base; > + end = start + region->size; > > - /* 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); > - } > + reserve_bootmem_region(start, end, nid); > } > } > > diff --git a/mm/mm_init.c b/mm/mm_init.c > index d393631599a7..06cd5f93f9e7 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,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 = PFN_DOWN(start); > unsigned long end_pfn = 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 = 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 +2577,12 @@ 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; > + > + if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) > + nid = early_pfn_to_nid(pfn); > + > + if (!early_page_initialised(pfn, nid)) > return; Please make the test for early_page_initialised() inside if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)), this makes it clearer that it's only required with deferred init. Other than that, Reviewed-by: Mike Rapoport (IBM) > if (!kmsan_memblock_free_pages(page, order)) { > /* KMSAN will take care of these pages. */ > -- > 2.25.1 > -- Sincerely yours, Mike.