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 1C834C3ABA9 for ; Thu, 1 May 2025 22:55:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 802B66B0092; Thu, 1 May 2025 18:55:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 782F86B0096; Thu, 1 May 2025 18:55:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AEC66B0098; Thu, 1 May 2025 18:55:16 -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 307AF6B0092 for ; Thu, 1 May 2025 18:55:16 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1B07EC060F for ; Thu, 1 May 2025 22:55:17 +0000 (UTC) X-FDA: 83395846674.12.1FB4301 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf22.hostedemail.com (Postfix) with ESMTP id 51164C000E for ; Thu, 1 May 2025 22:55:15 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JUJZHVXa; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 30vsTaAoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=30vsTaAoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746140115; a=rsa-sha256; cv=none; b=HDFADBEGa1XC/JPvn0QZjRo2mLm677GZFkun6PsoCr+DuYsXzRBNLHogBe/MpfAWbvtLvG He3ParT6kwyxCUZJCPDQ3j4iYt9ONvIq99nx7ghc7pxLrF+tLiYoCAwSUqkh+tqvHxWXTL ibqfmaeDP8RLrDod3o8/Yof6LnNbivU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JUJZHVXa; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of 30vsTaAoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=30vsTaAoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746140115; 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=PU6GtX2pwIoZ+oeXsFDcea4JO+KvjjzbgnTTu1rA7Xs=; b=JCbx4kKO1YppaVg87Srp8w3qLhlGdzhaqij/knnZP9h0yOILDCgRSk3fOaP7TfuthtWvKi 5PuHkJwLx8CPhT9KmqKZg43A7hizRXqrOBvdVVPnqFOtVTEEW9sK+lP1DA8usx8UK2MZKf Gy0ezkGo4eEiN8yozDDOLhxHQJa3CfE= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2242ce15cc3so16198185ad.1 for ; Thu, 01 May 2025 15:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746140114; x=1746744914; 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=PU6GtX2pwIoZ+oeXsFDcea4JO+KvjjzbgnTTu1rA7Xs=; b=JUJZHVXaRn1My03Mgy/6kPJvqYorj9CDY/5wzAtPAwUYhlXx4nhod4WN1AhBBRV7/N Si2vGS4Y2C61zMI5kAehtIMzROREz5j48Zy6DyQzuw0HOXD0cuFCP8RbchpSZ+FWDRz6 2YTnf2cdkARG+VqKII7t9jMuJuEmv9kWVplZ/PwJBEzwv5p7Kfg+tyG5e/T5kXDS70ds DHCrk4X86yfz6dCTH9tsaEmIbtFLzSk9341z1n9Hw5J7O/6R6cntdYbrs64iQd3keqpi xl0SkmNTrZaoIBptAT63mtgdUotPLhrwNR6BFhGM3Z47IHSgP5jnICR+R4wRnrWtGE4q ZCaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140114; x=1746744914; 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=PU6GtX2pwIoZ+oeXsFDcea4JO+KvjjzbgnTTu1rA7Xs=; b=nj9Vo5bl/J+981xxcqo6012R8PJ5pLk2akM/0245j8CWIfNv1DXBQ3ffj50NNrx6IR Q/y9K6myoD7Y+WcDuxB8bOkGPiWvxdQ0rX0uUCHAldtxH5BQsi1p985+z1idjBgwQcBP UO2+URCvGsw2Vyhgb3WjCGxl7qOX1Nv+lsVzqEx++KBHbIunDoGvvHLOrwbxo85CrxdF GWw8GfhvU176exrww3Vp/P8g0gI08l5bjtCTflguratteawH8m+TA4SgYCuhQ07nlvhm bgbr15ltZn9oxG8THx4S2j/pH5LXrLBnjPv60R8sNUamEv7EcJGz7nJxpXHjoZrcXSPn 5jRA== X-Forwarded-Encrypted: i=1; AJvYcCVhzMLOCWFBtooe9s9Pd75FT/KdDrd1mpH29B1T7E8jUhKFUivY1jQHKAlTnJjNrbgb+Jg5lgJMxw==@kvack.org X-Gm-Message-State: AOJu0YzOH0YwkAc0D85wIw7IQZfXgi3L+Tvn/uMYoZ5s7juFpfpaGif9 FEe3YoELBJTO7OVeSxm31VHYQs4RVfnuVDJrf8NA48SCKhrRGE7vZTJCXTqE9ty0uO3Upw4xvaP f2LMaicUyJs0BlaiZ8w== X-Google-Smtp-Source: AGHT+IFpAiNl+3FkGzd/ZjF3I8ZI1ZYYyAMk4qubhYhnEjGbgwWF72zcJID/AaxklWlETZc79qrz2DC4EU5jSuqH X-Received: from pjbqc3.prod.google.com ([2002:a17:90b:2883:b0:2fa:1481:81f5]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2450:b0:224:1935:fb7e with SMTP id d9443c01a7336-22e10342da4mr11671725ad.24.1746140114125; Thu, 01 May 2025 15:55:14 -0700 (PDT) Date: Thu, 1 May 2025 15:54:10 -0700 In-Reply-To: <20250501225425.635167-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250501225425.635167-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250501225425.635167-4-changyuanl@google.com> Subject: [PATCH v7 03/18] memblock: introduce memmap_init_kho_scratch() From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: changyuanl@google.com, 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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 51164C000E X-Stat-Signature: 9fn4cs4hn5fbnb3cm84x966zej6yxar1 X-Rspam-User: X-HE-Tag: 1746140115-787321 X-HE-Meta: U2FsdGVkX18tIIogPiSOvW1j+B6Y8OzuaM5QKPwuIt2LDINpADVoT+C06BvtkWxUfO8NlaSMvYcNWBxf9iA/vVyTWxtfePOwzNagz52+kpkYPZXnOlQbkSZllQiYhF/btPxz/VAvbZxSFLjye71aj5oioAPO2pZ49kihbFkt1WTD94FFBOrvlRTx28zcqH8gLVljD1vlCnBtu08XQPZdzUYB2+A/9LtqHQ++gp+R0s3rhwGso38IOJVMw1scBN64w/ugVTaK51xQdABNWzM4vKMWHxwwurygw/+E/7FqWFmD5ggWqWMOQhpGiI0yk0tSS6HCaCD4bamGY+EfLfNf8yW3/gWUGH8iAXTZ9IoNYTQACfCymJll+icEw27kjQKA4oAWQ94PXjFQvoyNcoxW/GTfY/QUEKnXjjoxMCBczCpPifX3s983OxZxplEVCFwS/BeRu5UUadLFWIrK0nZk2O8NCCy+pa+npVqPd6Pd0jOXZKoiSR5EVKVi1LVH9rrxKvyYRhKnxQ0RBVyRXdBlgjm2nV86dtsLg6Z3Bn872tdzSxU4DKRv2XpA15V0K0awQJvrE+nJt0HJD4ZVq5pEUpiiBjNyqyoFT4wHIMx8Lr/OnpDvtYehjcdIAELjewN8LAQhUjR1H3SzhF7UmOi9NT9LJjkSgqIIXlgQA1mVGHzdXplf2p8dDiwNTpL4dKE/n1oVKq1c5xo0/TvUXYvuR8mUTBZKBIYnNsDEFJL9kjN1RZjLsURQGZlvsEcFJlBLq9Z3h7VXVCt+jhpgvHxMZEuh570K0lhNRb6T1BjeSEScV1TVJfJZLeJbRkHMIMK1qX65dxFWjaD5n9VU1BvgspnJmWLzmqWDjG119on8EsEokhOcP9QIgVtfXff/l/Vn9J6uZlV9ySkPOxOkOh6kk17L/ir9kDR6upnDG8EApdB4f9IRnslfxHujbS6B4u9i0M0JiyOX2x8aEEL7e70 jhV1leYV 936IlHhg4hp16asuw5KI+OdLogs9ab+nONnX08dEJJAOKZTr/9VCK0dvXy/cU3V6T0xmzbcQtIVhtCULtLwrNNPoqzCQqwVXXkKr/3UEqfvWzWY+iJSEoIXWDr0vkEDYFtHUmFg3wrj0TcgQQfRO4mxtRRW7Z9XyhzJX0qQVTQEmVmlAhxW1V5OSuBosV9GDFRKtn8LE6KqgWLbXZQwLIQk5TpwOii4TICe4e+rErVbB5EbPPYxU3Xi6YEdr7FAev+vYCDA2GxFVmpCdnPdqbPucMlxXyG4j6MV5a7TRE0dwMSCYd+CNu/oA6KItr3QJaeM58tdLQ6/L8rKDyGbKcazCNNy26lhr+i+zWhNBo9BAnENCovqTKOUgqSfPNzCxod6XZBNrTF6NEmMRLkPGcjsRgYEoY2sD+UUFp8jV6LReM5b3QZoXyeV8kr1oMzVeo0XruL4WDW6ffnKYtWC2G8ACd4/PFtMLk0XyeE7tba9Z+Z3blxsgyq5CV3eOAmOP9lmbk7lp4Y8/HDPNNeENdtnzaMy2CJeD3DXynxlSCCXJ2V9AU9o9h1OAg1FK7ShPuL9B5SbP6urBhcI3u39odDC1BuJRomuMY0z3+EjjATqkENQbx1X1OEj8bBVxn5QCe2W0cQ1XUFGC6my4= 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 e9695baa59226..acfcefcbb6c03 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 6eba0dfe87155..b9148822db7aa 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -946,6 +946,28 @@ __init void memblock_clear_kho_scratch_only(void) { kho_scratch_only = false; } + +__init void 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 9659689b8ace0..128c100fdb977 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 -- 2.49.0.906.g1f30a19c02-goog