From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 452323955E4 for ; Fri, 12 Jun 2026 03:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236793; cv=none; b=t2sVD1S1yzcmQE8SPzXNs6eO0veJ9Ap4MoqDcGhLM3tMRDTfnJOclgdGcGkRHYsWZcOZEOCp/xZH4uw4eQrGK6LBM0SksrM9t1EHpcLFVjV9FbFMS1Hp4JhyIa1pIQzBZHI/0/dCXa4khpC/wHlsM6CatwacDRK2Dg4nlj8m4sA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236793; c=relaxed/simple; bh=tWV4CHhKFWZnQSlJeP4GCbc/ArFl8cg1Tx6MtL2HZQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d4h/xXDvyB/uoRuwr37AZrTC2siBb2oatFWuaa+mLidiYyPcLXYRziRG33I7rUZHg/rRbzK5A5e9SBUS+ZpWeBOQsB9Z9fb0FwOCJ657AF8vI8NRFYvwdhUc8DNBBlbevTaa8UAOxKZqQq85eU/P58rFgW4XSHmmXxptuULLWPI= 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=PUcz6p1T; arc=none smtp.client-ip=209.85.210.170 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="PUcz6p1T" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-8422a92b6d6so296320b3a.1 for ; Thu, 11 Jun 2026 20:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236792; x=1781841592; 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=yvhwqnMK3KcBoOi11nGPI5ToHj8BHKdLuYKZ2RNMESg=; b=PUcz6p1Tg5BWQnxdWcgTfpDW+ToxFytREM0SUPtKdpqQe62nZspP6LSf19UTYFo+GZ NSbAGTX7zqBrjF1YAl8N95DUi8cciFgdRdfURPTX7CjH1ISLZ3if0MyM1RtMYhIjECkA MGXQysaUd8KiFLT0d4Zh0N5hYJyJvc143/UU0gcMoP8jGQMypBWvZ7hvWVcnFxZAFDAN PFvZJIvxhaVXR3Dp4uqRnkFRGCh+I3R9XkpljOjwrO7iyo862vW2MQ0qxyXoNa4Asd+H yzg8w9QkXM+aaQenaGXYnF6yNIrX/chzrgowYfqxz4dsB5FB4l7l4/iHwa9XbeIt3Nb+ H2pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236792; x=1781841592; 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=yvhwqnMK3KcBoOi11nGPI5ToHj8BHKdLuYKZ2RNMESg=; b=GtS6fYXgq90bBVCpEw8BqiKSHUX59819c29zee0gaXWTu0kaJfZY+ATn0IpZOPZ1pC K6Je/q4GWOMONX9BpLi/BTzmesAYCd2evVjgvTV7FJuy6YFaKDT5yWsqpIxuj82Gymc+ KWbr+p3R40yOzV43jYj5R8Q/CbZbOPQUr9T7X4JSIdNaRS8OaO4eZxKGAuKF/AYqV76a kn0tk0grY+dXhKNMDOo3+axvGSFn4gKSn6elyQPtSjPtMmVDN1mf4rfxrLcTBXy4Spgy sGfsL+SQc7SmJ20gg4QzEqjTac7hNR0S8yk11BRzUFzpaLm3FzhnkXaCySwVht21MC2i fWxw== X-Forwarded-Encrypted: i=1; AFNElJ+gqoMH72uHSaLgsXi0LPi2KT7Svmk8oLy1ToNkqMX7j21HAJ7UzBGQT7LOdR0xrxaSr7PwF44BuJb47tA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywsryd0uHitsX7WMGGz1ynkU/IDVoH05CyyeP2XrXTxqWRoiOdV BxEZnapipso6v/6nUet0baUdOYYmh/Spzir2k/HYMNKPVLIdzbIGnF36RztQGOwL698= X-Gm-Gg: Acq92OF8Cmi8THj9Li1P4dukv6N5hHZVbSt3luApGlWI/r16LLu+ghzxIXVOOjPuwTi XGS716duZ10+BRQxohfeumsTj75pHjAFg9NWtU8v7ZiQyttuIw07OaFS3IFrrLSa2nwTTLZhEEK kRHLhCUUy7+FgviG9zdxcrAdvSLMyd4JI965zbEVUuuPm1pPNPnM7hv9heG6q4vtYK1GMt/Uffn HekgiaJIDl9tW9Gy+2stgiCJlBZ2mk0piUGddDy1PMYLlEA9Xf4qHajEk5bNgNIvjfILclUvsBs ftsyRAKRxhoue4SAwteNChT22tDoDRiOeNs4xlTgykwyY5dnCX9qISnSNCk44oao37Cl7IoBl0z FE+A4iXYURqhOmWvrU50c62LBdoohJ5U+JY96T+/XsFRghgYR9QzaoOOGBG/VdTiCJz52x7/pxW Tx2gmW5DE0vgWjecvH+Q7rC/vO7u35GWKbSAW/wAJXeIg= X-Received: by 2002:a05:6a00:3a10:b0:82a:146d:36a3 with SMTP id d2e1a72fcca58-8434d0d07f8mr834215b3a.21.1781236791584; Thu, 11 Jun 2026 20:59:51 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.99]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ad03fdcsm643352b3a.24.2026.06.11.20.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 20:59:51 -0700 (PDT) From: Muchun Song To: Oscar Salvador , David Hildenbrand , Andrew Morton , Madhavan Srinivasan , Michael Ellerman Cc: Muchun Song , Mike Rapoport , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Nicholas Piggin , Christophe Leroy , Ritesh Harjani , "Aneesh Kumar K . V" , linuxppc-dev@lists.ozlabs.org, Mike Kravetz , Muchun Song , "Oscar Salvador (SUSE)" Subject: [PATCH v4 08/19] mm/mm_init: Defer sparse_init() until after zone initialization Date: Fri, 12 Jun 2026 11:58:52 +0800 Message-ID: <20260612035903.2468601-9-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612035903.2468601-1-songmuchun@bytedance.com> References: <20260612035903.2468601-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 free_area_init() is responsible for initializing pgdat and zone state. Calling sparse_init() from there mixes in later vmemmap and struct page setup, which makes the initialization flow less clear. Defer sparse_init(), sparse_vmemmap_init_nid_late(), and memmap_init() until after free_area_init() completes, when zone initialization is fully done. This keeps free_area_init() focused on zone setup and ensures that sparse_init() runs with the relevant zone state already available. This is also a prerequisite for later hugetlb vmemmap changes that need zone information during early sparse vmemmap setup. Signed-off-by: Muchun Song Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Oscar Salvador (SUSE) --- mm/mm_init.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index dbcd60a38c49..bdeaceadb531 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1814,7 +1814,6 @@ static void __init free_area_init(void) bool descending; arch_zone_limits_init(max_zone_pfn); - sparse_init(); start_pfn = PHYS_PFN(memblock_start_of_DRAM()); descending = arch_has_descending_max_zone_pfns(); @@ -1903,11 +1902,7 @@ static void __init free_area_init(void) } } - for_each_node_state(nid, N_MEMORY) - sparse_vmemmap_init_nid_late(nid); - calc_nr_kernel_pages(); - memmap_init(); /* disable hash distribution for systems with a single node */ fixup_hashdist(); @@ -2679,10 +2674,17 @@ void __init __weak mem_init(void) void __init mm_core_init_early(void) { + int nid; + hugetlb_cma_reserve(); hugetlb_bootmem_alloc(); free_area_init(); + + sparse_init(); + for_each_node_state(nid, N_MEMORY) + sparse_vmemmap_init_nid_late(nid); + memmap_init(); } /* -- 2.54.0