From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C81382676C4 for ; Thu, 1 May 2025 22:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746140116; cv=none; b=VfKmrBwYqJaaUoNVCr/qA2qCllu6C8bN1nLdgbWK4xO8AMFOfNwusescHLCWewWoJbHYy1a6QE2Fn68gZkd3UtqS1IfeJlX9Fd+bsLikynxDSjxUrej4cmu/uoqsRaRyUCB+Fip87XJGx7uDSPdoNZBdcfHxR678bm8JqD6rCto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746140116; c=relaxed/simple; bh=DjkyaabI8S3sYdPbumLk0oLt4xT6sIysI2taOcvcejo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QlZf4JvwaUqoUYjXg4Go1IQugG403UsxBDnYUHEvWwb/MAyeHX8Qd+XLJD2m4dAeUMovtk7b3CSnPvd1yw8L+VmxbNftzc/zIi7E8z5/i+t3gX5fFwaSJqrHUc+8fx4o2OGcqqgvyDykea+bHSTlH6cuWC5C/7gb6YVx7qa5TqQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Csamvl5P; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Csamvl5P" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22403329f9eso11430775ad.3 for ; Thu, 01 May 2025 15:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746140114; x=1746744914; darn=vger.kernel.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=Csamvl5Po/98DTMJt8L3/AeRsSKazN1dvQD5iT6si15hAwi0gzy4ACxvbcrbAbwHTH oQ0WB4NUvpzHerJe4Znw301JXzVp3pod7KWbJBkFvIi3v1Lh1IuA89fOl+QNFKwLrQ5U 3CbV1qZPEPyZB4atmpDUriaNLMhJIvAKPZo7rhtZPUm+Ve/8xPenJPRd7lK/eM63NaS3 xpnHqNjHC7UccZ4t00ZNQ4NGdu6xb/Qv+GiTYY7uD//ok8sTrdBzDOewtGwNlPDn0Sje fSkWP4zC26gOAoaVmkcEMBGBXY9OSBvRK2Fi0zQPFS+CD8TydKJPfXkYk520+TCg7p+Y vQmQ== 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=LNO01k21MFNDDeLPUEgbbMEV1tBdgY6cqUC0TUtj0ykr066zUhQpN3QwdkPU50/W6q YWBr7+Qoak15EmJ1iQlQ887Z7QGQG+WZZO3ScD8ni4204EYnDVri2D8+f5kCanPenPJu Akk7kW0D03JcwrDaz4JUeK/rH5pBUIdgXjaB/ML/wB0gaUVA6bd+c1tZMpmuXRGiHAQ4 27SlkaROMMT/FfiFMkURqSEigbEcGqdCvWv581tAW5XZNirw7BKzpmnK3rcmOVaCqdZ+ YFMOn+VXjnBQNcm1gNrrNg9sYh9dinY8DGfy7AqU4F+UVQYr+lseYTfBL6zWTy7BKB6o Qokg== X-Forwarded-Encrypted: i=1; AJvYcCWgHc3KyBSYEQZjbh54N96KMq7qeLSXmIPsPcocaL9nC8NvZK4AFkssHwmhgIuzIO5V0sQn7OjHutZQ@vger.kernel.org X-Gm-Message-State: AOJu0YzU7TmyIvTZRE/VJXcinCVDeWz9A2RpNO+fWxWqdBQuZsXh/LPZ FueyR7fYyCNWBt3n2VKEu7rYhusyzg5yNRqC6gp4HugdYfrij3zKGlpR+2d9JzTOYKxZckmTEvE yGSCTwdMosJ0Va+LJpg== 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> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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" 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