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: 13963079 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 CA907C02199 for ; Thu, 6 Feb 2025 13:29:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 607D4280003; Thu, 6 Feb 2025 08:29:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B654280001; Thu, 6 Feb 2025 08:29:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 430F4280003; Thu, 6 Feb 2025 08:29:03 -0500 (EST) 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 8FC50280001 for ; Thu, 6 Feb 2025 08:29:02 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B033AB2066 for ; Thu, 6 Feb 2025 13:28:50 +0000 (UTC) X-FDA: 83089600020.27.FC5F811 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 11BCC140007 for ; Thu, 6 Feb 2025 13:28:48 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iP52aTjs; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738848529; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7882muB/Tm8hGGnNePu56w2ZumLV2bjuy1gzvj/jTBc=; b=BqtiCVt/yRI79D6MC31akIK7YokBFSdg8T1+nlTsrjEHBxRiyaHWm197mwTpFjAptOylb4 /LVOdBe9qe5orHG4RbfLDmCmU08V6Pd3PFxAf1WHofs03Q5knb5s94VHvW/tnOTDOx5+fQ FzVhIFX06wN/i4KnNgTpw14FFA5qA94= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738848529; a=rsa-sha256; cv=none; b=Y+2AFZ863g++0XgtDRli0BGFP+eiQv7d5hQPsCprgBKF8Yfd5l+AeSBVwJxN96zdb6vU8F 1CDrcjKOdO27K5u/vOUsyZNsEcYABwtlPzLJONTjsOlDG6Q/4tS4kcZmwmOEGcADtnpCul 6fud6vSgUbTvbNRkUxfbyvwhsRflHDM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iP52aTjs; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org 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-Stat-Signature: gr5rnyxrz1h5ecttct6rgu9sf78dqsks X-Rspam-User: X-Rspamd-Queue-Id: 11BCC140007 X-Rspamd-Server: rspam03 X-HE-Tag: 1738848528-660913 X-HE-Meta: U2FsdGVkX1+8qsR3bWDbv8Y1YmYgqkPEu9aMtJnFym1EKwLNu9KltmDSbeJ3agKyLkQGTsbt48G6MfVSUFSkONm4K8a2X7oq/EM3MyGSOo2oHZepldtDW/CSoTwjRww3COUsZJ1bUsyvFYtN048NEwBZPpWQn0zstI/4FRXRgW8FVigrFEYinV9nuNQNlo3cYRPCH1PRpdHSefiGkTqC3RLjlHeZ/5n0HQf34iwgIbLEb0hPG+GxXa7Gmku/83SL0x5lJSRkC6iub38roXhI74PERfqd5YDw4EOPIJZR5JULAdt+4A7KAbP59FzWMCsF4Y8dDNGGuvuMwyZV03+LnTmQg28Nt8yUa00cHlY1etEAf3r8R1/+BpHIXis1gj79IEEsb3CMd2gijg7unae8LbtuY+FYyoDL+L1MUtNPMoUFN1FL+C9kfSPNdfDzExnHGnVU0pgxLD1mO7ifHloH0StfFnnas40YCnm3KR32eKrxr/+NErKAZSNIj6ijQLj3kD4XIdGSUQ8Wv4nW0jxAqKwv+CJvu8M3F5vzBnU1aRjuXkefPUr4tk2SB8VyArHD3pSYU371yA7b8FVukSG5Ij2FI7WFJgJG2UFCfZIrG9IN7MgPEwvzUhRz2C0vtFEgXYphGB8D6OCxFP6e12oj/SqtQvHOarkiZQ9abAViJW39Sfj/PMpADVEPmDbpr6CpIqg1TaX/gC2yy8q/Li/+m9U5HlDeeMkXlbleIEPMfv+EaJRLZ0PiAXSL544IojBLTDAClUfeJI+3eupsXZXUh/3hNJ6MEZ36NfbTXgo6KwNwbeSmWU/GNOkTkD5M53r4hFhp/VI9oUBm0TjOWLUVcrrmLyXAb+eEp6PIaic0ZcN5IuIHK2RcTuUtHBcsFy7qvbaVG9PO3bTKaPBsIufOaE5kDyIblPsuV8y3+n/WF1FPsRkpoERof60X2Qp+VGdqImDfIgK2rKfcNMNDWXN dDcaf4hE cw1ULkcsjRFKHRBZS4QgMhOFARI8OCzMacevnkI72VIgSRxjsTcHRWZ7K/5rbUDQlhB8qaIPnFtoZTjFkErs8MGfUBZpmO41IlmcVX+KK6kWzYg2t5O8jILfQARI7XCWsBhKQ0710U4GDabEdemofh13lxoNtL3RQsWybS6rmX0sk+v5EZCxNmnpf7dGqdeHp9dx0kCoqwJjP7uQP8hie+G4X4khdBxyXgRk5nv8Gr6z9PjWuwSoehg6+okrmSmxIAQk936nrGY8TjK/qlBrBNswg0pWIiL8V22gpOz//8vEDdlW1I9iomaGwwHmPyGxaiwTxXyrcIfGMn1hU6S2idBdoV/BfKLBt/+DBRWKlHMRmIl4= 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: List-Subscribe: List-Unsubscribe: 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