From patchwork Fri Apr 11 05:37:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047563 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 C534AC36010 for ; Fri, 11 Apr 2025 05:38:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1F8628015A; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AAA54280154; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BE5A28015A; Fri, 11 Apr 2025 01:38:25 -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 59977280154 for ; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F1D7881ABA for ; Fri, 11 Apr 2025 05:38:25 +0000 (UTC) X-FDA: 83320657770.20.BDAA84A Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf29.hostedemail.com (Postfix) with ESMTP id 39947120011 for ; Fri, 11 Apr 2025 05:38:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1DtlM0vv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349904; 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=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=GoUYkIWtwfiv+2ZF+zwe2RstS/2aq/ZxiDrtCyAhNDwfCr0sJGbTn7P12BsUv90KCL62XO /Qsgia1crU0837kW5EQef0N+W3IM0tNwJE1UhAxoJsTAbtwqJ9FDBCVrVZyz/rzhcOF/sA Z7NhRyzp9dhBdCvAev2/nbg9ZPWiulA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349904; a=rsa-sha256; cv=none; b=RDiNNlA7tc22CWxPfUwFqrsFknaJfwArv4GpTK6Yr72KZOoywlbFGkkTpdrQKf5zWazrhp C9Ygb0b0WKgBrEpnw5lxtk7yRIyUZ91+M0UPRhiQ9KkjwwVJoN01CW/cFAYKN8cy1rxHn3 c6dNuycrHRThkNBVnuyup4QJFpOXSOY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1DtlM0vv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff62f96b10so2264075a91.0 for ; Thu, 10 Apr 2025 22:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349903; x=1744954703; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=1DtlM0vvRDglv/+LGLf+7b5Zyf05aeewnsIYrDy9iDnAkpwLtLEba6335IpK4vTPPV QnNLKlgzTbybV1ugT2074H4pAGOLrtcKzO+q51utIK6Gpe1717n0e9KS/xbQQKRJv/th Or55fgSO3VGqzjScr0Yf0EQlB1G1eNl1duQ2HAUsbco/tMZo6af8uKPUN9uAQZ7jwg9m HavwfU0CrgIlTZMSDFT1b/0KQcUve8qIWBc7pdtwSDpHD/BQYd2ycj6TmBOpDeNX1xaC IObMQeGmcVJ5VO4Z2NNgZEiWToMyMqGOOouXMLquF8HuJWXfXro/eyXU/xHUhGjxbwvH yC7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349903; x=1744954703; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=rv5zBnk7GEyjtW0SnRE6oI9E8bJOQgybA7CuqO7QnrymmX4tqdvV/EaMRdDH+uduH9 VsYZlyaBzbh1gpgVkXpn5o5h7pqPq+TNgLNDFSrxO/JQyziLdqJSFp7eQG7A//fw7MNx 7VY6TpuVcm4UqM/oaRPKSpeja3f3nV3MwhdqCGqBjN/NjxV5ofrYq7uZrksP4phNlEUR v13dnObPG6io6gRhuPiS6OgBawQEXdBHIUBwd+YKFaZk7OnYbDYuACHtVKVkBji+YMP2 xJ09abHTL2CvWW8r0yGRrn5i+33Y8CCbov6e7HUYFW8mXuY1kzhBZaZkzzygp8EDPQ1l Kd/w== X-Forwarded-Encrypted: i=1; AJvYcCVV74VmCnCOCpeUzprvuKf3d91mpz0DXmx69mCLLG3DKE/iMyEY3u+A60SrFIBprfSC2NEzQ7oKIw==@kvack.org X-Gm-Message-State: AOJu0YxhTD7ktuStbbaCHGKVXsbGW1xITum4FIqdw0SWD3U0DpO8H63P eQV2swc+bQL3N7PNahQGDNITzAIlixCy/bSXzkZ6l07hI0BsbU8vpnFzHELS/u5gig4c2MJ3voO mnFtXgtkFM4M4D62SgA== X-Google-Smtp-Source: AGHT+IEQLxxV+9EOL9iBdjttC+lt0gaa754ZypvrGgSETMYeFa4LebcqyNIPVN8012BWASehCUTqTktaMea5N6/C X-Received: from pjbsg2.prod.google.com ([2002:a17:90b:5202:b0:2ee:3128:390f]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:58cf:b0:2fc:aaf:74d3 with SMTP id 98e67ed59e1d1-307730fecb0mr7763347a91.4.1744349903054; Thu, 10 Apr 2025 22:38:23 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:34 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-4-changyuanl@google.com> Subject: [PATCH v6 03/14] memblock: introduce memmap_init_kho_scratch() From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 39947120011 X-Stat-Signature: sxdwxb88fjqxrmet8sios45y9jo1ny6e X-Rspam-User: X-HE-Tag: 1744349904-140569 X-HE-Meta: U2FsdGVkX19H4fCQ5jh51wOM/+/k53+re5YcsayYtwDQxSFWxmgjD8qNV31V+6Y+C0MOZx/4UyDd1+322Vr1gvKY0+e1iK/+b86j2sEYVR8mWjV4Mve5j4AAiCpjHOkbAyxiHMibeajV6jDjd1GLzBEsECiVLYDP+Fke90Fwds3qN6cgHz/bwdPo6aHnRrZs3LE891Hu0/RgLrHgZIMwbeu+89VX2PvAxz+6jlh15OcRIvTI3JdzqFdixT8ocHbm2wN/AsOsDHZOIkolEPDUUgXXCAbEbRtYC4s41OWWD6F1XzjuVx+Y7ZZFLQZF5xJWJpD4ABiz9eC7Tneb190BT3bZp/AKndXvTIubovaASThhSGBkRNAjnHYIxt8LgheTBuMWP+tu09U+qzKiFA3VdOV6hN+Sjgzglu95kzhWT2ofCuaADrHLHoBxvS6NKYqC9po3WqsPFZI2ra3V7oATMz8RhuJSpUdkQBfiuwrpb2wu5fjmKUJFxL6JTjfB0aJ+utEGBqAcTffUHJSRNNZ+BbcT3mwGWZe/oSMrPYFUEyS0lRvvM9OoDBHf4aCgXrJc8vlWxDQYhWnnFgNgH+UwOFVRT5hP1+B5mkx0OTMoFcAt52fvZ7emaTGK1ic14zV6BPrwv++To3kDtgPwgt8AaBcHxFoFszX7EHNHPU+c+CPZTq4/jBTGmfhzZX6ENcm85Rw1xtQkMWkUD0ASQeK1rDlKOJajZVDMkL9BTEAqN6x0rL17EdnIRl9AgUo0OVJGNQpKlT5j90P5cp3Pe3Nk6IylYPSVv6xBiQDjdhBoa2oP+u6JOQjLpOYQ99BIwv0+LBuQDT9UhJdTZxbtWGj9HkQBpYJHTzCeK4wE4XlGNsS3GP3w+2jxujQY1XKnSlwB7CR6QaQTo1NLU4Yrae6wt0qADtwM2HygiwosKsq3ijV63dRbI+llw8Avs6uxMTgoLe0ANt3vtsPPYCdOGN6 jDhp40Z7 4r66MfjFI1iNDeFN0VnBFztTQ4sCcYRDMFszhAWFfhw5611eSnTF1jD8oSKMZYRii6XpfOngQ4A+aYiLPa7/S4o5aj2LADoZxfVFKat7hC6anULEmf8F/DFYexqwYD7Lx4ES9740YzspZCr7KOBeUgkfKQfDsRRCm+RdNyw/Hr4CUOLYxOZTiLpJdOFeXyrCy3rGP7yRungaJpqdUEAfhKEZOHo0BBCzTruPHMPoE0aNrN2IEY0GKsgO2K42HocAdIWQyUkfZUq+jieJeWDJtQ1aXni1C3+pxou2Rwh5VYbqUH41aiSfP68k7Nd5fMdIMo+NBJBtJrs3rNYsTAcSusRsKzDKs6fF4J865msK7UgE5C8LbfpyrbT9AqNVR14ftsrlJ21FXd9P3R0ViNxcew0OChEO5hmlKukCYYzdgfK6cRcTHHMlZ9El0t+a6GtzYLdRq3LuT1ytogSKKQbgVsWdpZxxJAkYJTbgMtfeMUjK9PlSTRXIlvPs4Q1dHrlc63ElFWhsNGBsMELG67f68/tMtwcalQU6dEFxVaIZZqLMOf1uEP20uv3zn2FKz2YDGdwNJpyKTHdJd0C6zKbXtvhowHcnmDYdxePttf/dPjz8hXpVX3fvXB70JvolKhmFK9i38TUoBccmeNsY= 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) Signed-off-by: Changyuan Lyu --- 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 993937a6b9620..bb19a25342246 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -635,9 +635,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 50c2f590b2d04..a47e5539321b4 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1121,6 +1121,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 3a213e2a485bc..c2633003ed8ea 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -946,6 +946,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 84f14fa12d0dd..1451cb250fd3f 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -743,7 +743,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) { if (early_page_initialised(pfn, nid)) return; @@ -763,11 +763,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 @@ -784,7 +789,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