From patchwork Thu Feb 6 13:27:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13963115 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 683B7C02196 for ; Thu, 6 Feb 2025 13:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7882muB/Tm8hGGnNePu56w2ZumLV2bjuy1gzvj/jTBc=; b=j4/9A0fdXSRWJIBRov4JMcNXmH 7fQ4YrcyUSfqEXF/n4PagiJyYZAM02oFmuMKvXgvC8vNBjPvk/7qTT+4BwT14oTrANygxKQZgpSQA 5nr8wXpumMJYbm8bZ23cVMJu5l7WlmNqbzQw0enkfUUOYRnUCZqpEgxOqCAwPAclQ+vXpQRoovXcB irwiuZ8O8bh+2Tsu+GK/TRl0cIcN1DLOcRf3TLSTBhnleSDItN91n9q06JfIfTliZ6F0lXqPMxeuj RAgROAJt2dYDp0F/dHmjpMSAm5hAJvErN8IN0wVAK+7RsiTcLisjRh1gLpMI9C8qH2ACSNHhDiL2v veJKUhLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tg27k-00000006Sw7-0Jdj; Thu, 06 Feb 2025 13:40:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tg1w4-00000006Qio-3Bpb; Thu, 06 Feb 2025 13:28:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=7882muB/Tm8hGGnNePu56w2ZumLV2bjuy1gzvj/jTBc=; b=kXPjO6REHHnyvBxe8PMCof8h37 S8AHJDzEVt6MyZqLjCGvQPBTfW4EBMp3Ut9ztqmrhXIrt8Jyfn3/H7ucQZcTLK3thEVLHfxWa6+T/ qkaXkRHbbhQMeQNZOAvajrUGNCYxDXU/WtSUZDKQrjDIUcl+hRhrZCVFyX3IHbwS8erX4D6r7Zj+g RLgkHIBFtrBo41joFVvxR+saYlfFZbUKQCnQZvcA8LskCYozx06gqB+Q8wt0oqS18X/0YgVoar52B mTeOJviRObQigIntoMMSp1C+A0xWZuKs8B6otVuid+jrs51W+ys7TVYtR+3W2KjZksoy4pDP5K/ix 8I8J0HHQ==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tg1w1-0000000GwwO-2gHu; Thu, 06 Feb 2025 13:28:51 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 915775C5DB4; Thu, 6 Feb 2025 13:28:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EFA4C4CEE6; Thu, 6 Feb 2025 13:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738848528; bh=vZ2oVKwNk81LIKw4K9tDNq2MhirLQhNrcfqw+4p4mWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iP52aTjsSBe2LDTe0pnAzCseffHQfiiXLdkCZ6YMmfdqtWu+xXwHKeXFw5hn0E2tQ 3GK9EJlIQnIlmzDV1l5xvcVpE+O9OEg5NhBeupMsH69YOSFfRLWkuti9O2ZZ9XTvEi KELxGS/6NrXc3HXJgWAq3t43QkPSlgM70G8Sm6B9VHfcpUtPqBkJzN9UbM348fuIIl XoZYpln2ARsIgWzPR+jTMVjM0ni8Kkgt1Y5pPt07cmB2c0Jcs8s+AR4y8KZzMHfxO0 GVVM5EP/C+/iQXBAp2JMJS8wBwuEveVCeEXRYQxJzEbX7AmM1lgqXq0u3RHW0mm+tG 6KRAnJV2bv4fA== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexander Graf , Andrew Morton , Andy Lutomirski , Anthony Yznaga , Arnd Bergmann , Ashish Kalra , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Dave Hansen , David Woodhouse , Eric Biederman , Ingo Molnar , James Gowans , Jonathan Corbet , Krzysztof Kozlowski , Mark Rutland , Mike Rapoport , Paolo Bonzini , Pasha Tatashin , "H. Peter Anvin" , Peter Zijlstra , Pratyush Yadav , Rob Herring , Rob Herring , Saravana Kannan , Stanislav Kinsburskii , Steven Rostedt , Thomas Gleixner , Tom Lendacky , Usama Arif , Will Deacon , devicetree@vger.kernel.org, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH v4 04/14] memblock: introduce memmap_init_kho_scratch() Date: Thu, 6 Feb 2025 15:27:44 +0200 Message-ID: <20250206132754.2596694-5-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250206132754.2596694-1-rppt@kernel.org> References: <20250206132754.2596694-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250206_132850_207040_3685A129 X-CRM114-Status: GOOD ( 17.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: "Mike Rapoport (Microsoft)" With deferred initialization of struct page it will be necessary to initialize memory map for KHO scratch regions early. Add memmap_init_kho_scratch() method that will allow such initialization in upcoming patches. Signed-off-by: Mike Rapoport (Microsoft) --- include/linux/memblock.h | 2 ++ mm/internal.h | 2 ++ mm/memblock.c | 22 ++++++++++++++++++++++ mm/mm_init.c | 11 ++++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 14e4c6b73e2c..20887e199cdb 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -633,9 +633,11 @@ static inline void memtest_report_meminfo(struct seq_file *m) { } #ifdef CONFIG_MEMBLOCK_KHO_SCRATCH void memblock_set_kho_scratch_only(void); void memblock_clear_kho_scratch_only(void); +void memmap_init_kho_scratch_pages(void); #else static inline void memblock_set_kho_scratch_only(void) { } static inline void memblock_clear_kho_scratch_only(void) { } +static inline void memmap_init_kho_scratch_pages(void) {} #endif #endif /* _LINUX_MEMBLOCK_H */ diff --git a/mm/internal.h b/mm/internal.h index 109ef30fee11..986ad9c2a8b2 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1053,6 +1053,8 @@ DECLARE_STATIC_KEY_TRUE(deferred_pages); bool __init deferred_grow_zone(struct zone *zone, unsigned int order); #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +void init_deferred_page(unsigned long pfn, int nid); + enum mminit_level { MMINIT_WARNING, MMINIT_VERIFY, diff --git a/mm/memblock.c b/mm/memblock.c index 3d68b1fc2bd2..54bd95745381 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -945,6 +945,28 @@ __init_memblock void memblock_clear_kho_scratch_only(void) { kho_scratch_only = false; } + +void __init_memblock memmap_init_kho_scratch_pages(void) +{ + phys_addr_t start, end; + unsigned long pfn; + int nid; + u64 i; + + if (!IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) + return; + + /* + * Initialize struct pages for free scratch memory. + * The struct pages for reserved scratch memory will be set up in + * reserve_bootmem_region() + */ + __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_KHO_SCRATCH, &start, &end, &nid) { + for (pfn = PFN_UP(start); pfn < PFN_DOWN(end); pfn++) + init_deferred_page(pfn, nid); + } +} #endif /** diff --git a/mm/mm_init.c b/mm/mm_init.c index c4b425125bad..04441c258b05 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -705,7 +705,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static void __meminit init_deferred_page(unsigned long pfn, int nid) +static void __meminit __init_deferred_page(unsigned long pfn, int nid) { pg_data_t *pgdat; int zid; @@ -739,11 +739,16 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static inline void init_deferred_page(unsigned long pfn, int nid) +static inline void __init_deferred_page(unsigned long pfn, int nid) { } #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +void __meminit init_deferred_page(unsigned long pfn, int nid) +{ + __init_deferred_page(pfn, nid); +} + /* * Initialised pages do not have PageReserved set. This function is * called for each range allocated by the bootmem allocator and @@ -760,7 +765,7 @@ void __meminit reserve_bootmem_region(phys_addr_t start, if (pfn_valid(start_pfn)) { struct page *page = pfn_to_page(start_pfn); - init_deferred_page(start_pfn, nid); + __init_deferred_page(start_pfn, nid); /* * no need for atomic set_bit because the struct