From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 251FD429809 for ; Wed, 13 May 2026 13:10:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677815; cv=none; b=gPyLZqPCh/oSKl+diXgI+0xF9ITQCP3HSBuPMbVpbRYHk/qVWpR3dlgUh8R+Ti5kgenO0PjcbW/K6L1r7rDhnpynj/MNRnCsQn5qYlE0/dT7lc10kYDGcsWMZlc2+RqSz1A0k7QAGZ7o4zRSH35duE2q7s2xVRAargWRi4n3Ht4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677815; c=relaxed/simple; bh=TE2T49mrEQxvhbSqlhtLhCmwNbyy1/WRzsPryJi4Ej8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TXukDfS7LwnaB9HRMahbxHS2ZHBFlhuNlhiolYteTMucCh2+gTmTgpd44ohRYLw2wzkKZAlrXf47xL3M6KFokSBZBX7wXN8EH+v017f/bv8/yer7xIYQY379mEAAeGOdXpSGktqK/RzWJ9kCLRA830gKBAk8sTAoAaw1VxEbkB8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=ZqnB1Yh9; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="ZqnB1Yh9" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c8095d7d75bso2825792a12.1 for ; Wed, 13 May 2026 06:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677813; x=1779282613; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y3uLkZc/zeI4wWlYRCnYJNtlEmmCl6e0Ymtz/E5HBFc=; b=ZqnB1Yh9lf/rsTfqV1f9aXZW+JgptaZJKmoyRnR2/7DgsIU8W4HoFkrWTEaCiWKIoQ UdcRqFt8QRa5qeR7GvRyJ9NgCFh0YR8AjJgxt17PnERPRcB6msr1INa0E7PyFxA+xYc+ JYEVSnlISVtfUaG3mn2YATYcOG2wAOD+DLmjHc/CD8eiiBq6axujTFWHqT8M+kX132R4 9PUDYvkaH/ivkaBI3gQL6gRwM3Z82X2XL35fn5DIctA64lfKJzw2N3aMYrUh7Y/ibLgK MMEyVsfAxOaC/P8hqrq1nsROQLXPXgQRQlxX+UN21DeLXjLYuFzfnBdPC9CoMVclndY2 XnhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677813; x=1779282613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y3uLkZc/zeI4wWlYRCnYJNtlEmmCl6e0Ymtz/E5HBFc=; b=MTu+emLhoFNYI8oWQifrbbm4ac9zx/Yajj18O2a/gki0fFdPxG0yVtJXAACc2IIhQ2 l5JcmLJizx4VAkY8DkyvlolnDZyMkHoR447NO6keE/H2ppQbN+D2ijcSZIG2H6hv7qIX sgAK+E67jkfvCidjra+s2Mtl0zMEQN1KI0+PbKFLucQmZ2i3krb8V1BJzJfd83qazWZ0 GNu5b2Ysem3V4nRCcr13OlLGBwA0S1SGG4+5r73l8Vjq/pU4oGVhrF4bDHUOjdSHYZn2 Toi+Slmbicr8eDokWSj3IUxNArrYnucggpUy8jbu57rRJvq6FLDNSyw8A1ASNxtQp2Hu cX2Q== X-Forwarded-Encrypted: i=1; AFNElJ9ulaxPLoxyTIHAXZ6mC54rcMoDyfFu/QniTffIst9ySrXxGDrvuvDxeG+Fe/yQv9l3KUer8iNxKIVQFI0=@vger.kernel.org X-Gm-Message-State: AOJu0YxI5voy7hPghqIITQkmoSwY2sOeMqyHgjiYnD+2RFbhxFQc3bFP Jv8dXHnCec8dTx5LsYrHTEIMF5V9QTOd59k23AfwzN1c5Dbzv4V16oPHoG/lbwtktQI= X-Gm-Gg: Acq92OHIF6c46/SMGfv7KFW7+rwl9GB93z6B+xzMuK1jCfosnvxA5PJEUeKCxhYP/z/ MOr4ReAs7XaW2wxMumM4I3ay+MUgpTFTvZXW2Jj6JuCfzNluBeksFrrc1FR4srSIwVVJlmfa/v1 BOP9hvHpCeKz4zQGQtIpOQBeSMuAoAoKEVCtBMpnBxGoMkgMWe89WrCeCDHlaQgTlIYFRViBIg7 5Y1K8oLkg/qYIiXsQWZ61Qro6eJeTIZo7OdwaBDkT2pgZgj3MpT7ST33wVRijXaVkwHh6/3ZwNf etczegtzKuP6xayFYnPafRBWMrF28dF1sQgWdVL7pOwCA7s6lg754opEZXDLRIYW6KqXTaWevLw 3QzA8jn07kLPLfKqiAUV1sd9ayuUvxo+PR+cRMH/YHmFRHGeRA6ilQPt3xIymm7lklh9AdIenxk 5jS91zBmHlNZ7VQEWgGi6FO8KxjURwOsIVr21S/4V1qNgcxcvFReiXwJ2Mhs8= X-Received: by 2002:a17:902:e54f:b0:2bd:4b8c:fd30 with SMTP id d9443c01a7336-2bd4b8cff82mr5004355ad.41.1778677813243; Wed, 13 May 2026 06:10:13 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e90854sm166641925ad.66.2026.05.13.06.10.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:10:12 -0700 (PDT) From: Muchun Song To: Andrew Morton , David Hildenbrand , Muchun Song , Oscar Salvador , Michael Ellerman , Madhavan Srinivasan Cc: Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Nicholas Piggin , Christophe Leroy , Ackerley Tng , Frank van der Linden , aneesh.kumar@linux.ibm.com, joao.m.martins@oracle.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH v2 29/69] mm/sparse: Mark memblocks present earlier Date: Wed, 13 May 2026 21:04:57 +0800 Message-ID: <20260513130542.35604-30-songmuchun@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260513130542.35604-1-songmuchun@bytedance.com> References: <20260513130542.35604-1-songmuchun@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Later patches need struct mem_section entries to be available before HugeTLB bootmem allocation starts, so the section metadata can be set up at that stage. Move the memblock-based section present marking out of sparse_init() and call it earlier from mm_core_init_early(). Rename the helper to sparse_memblocks_present() while doing so. This prepares sparsemem section metadata before the early HugeTLB setup path. Signed-off-by: Muchun Song --- mm/internal.h | 2 ++ mm/mm_init.c | 1 + mm/sparse.c | 4 +--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 2defdef1aedf..bf30617c78d8 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -962,6 +962,7 @@ void memmap_init_range(unsigned long, int, unsigned long, unsigned long, * mm/sparse.c */ #ifdef CONFIG_SPARSEMEM +void sparse_memblocks_present(void); void sparse_init(void); int sparse_index_init(unsigned long section_nr, int nid); @@ -999,6 +1000,7 @@ static inline void __section_mark_present(struct mem_section *ms, int section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); #else +static inline void sparse_memblocks_present(void) {} static inline void sparse_init(void) {} #endif /* CONFIG_SPARSEMEM */ diff --git a/mm/mm_init.c b/mm/mm_init.c index 3aaee1cf7bf0..6723c604eefd 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2693,6 +2693,7 @@ void __init __weak mem_init(void) void __init mm_core_init_early(void) { + sparse_memblocks_present(); free_area_init(); hugetlb_cma_reserve(); diff --git a/mm/sparse.c b/mm/sparse.c index 3e96478a63e0..33e89bf1ec0c 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -195,7 +195,7 @@ static void __init memory_present(int nid, unsigned long start, unsigned long en * This is a convenience function that is useful to mark all of the systems * memory as present during initialization. */ -static void __init memblocks_present(void) +void __init sparse_memblocks_present(void) { unsigned long start, end; int i, nid; @@ -361,8 +361,6 @@ void __init sparse_init(void) unsigned long pnum_end, pnum_begin, map_count = 1; int nid_begin; - memblocks_present(); - if (compound_info_has_mask()) { VM_WARN_ON_ONCE(!IS_ALIGNED((unsigned long) pfn_to_page(0), MAX_FOLIO_VMEMMAP_ALIGN)); -- 2.54.0