From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 DEC4E3905EA for ; Fri, 12 Jun 2026 04:00:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236809; cv=none; b=hoz9cYYyHQdGgTzdWmfbRIwZpVKoepko/x8g2CDNTwVspMfjKsDwQWqgxFIYViL0pj9kXErQscBz4mw1pYb7M3J7mtADMlWWHyobmT3COBHhFs9WIwBLhf+DAjL6EmOAitQ0DGXNxDModbIKuWJSS2zDjQfSLcAcBw2EnLyuwbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236809; c=relaxed/simple; bh=U/4r9FtVw9ianEqyZHVkTCq1SCnLdCHhsLxrVjDkWdk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oUGdrNKh+Qr6l5l9s2Uv7FkJBjmAY9Y3EMzjoGb9mWUBPl5dOg5E4Q+jYBHFnkUO92MNnYGwAzryg0Ys6DIVmxDdnk5KtJDwTQRDo7I4jkCWiqVQbTTDOQs89sVsEz3zeqC83t7ZGzIIEtobFMXNzOx0eW2I0HW23MRgF86XH98= 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=D9ppYEdK; arc=none smtp.client-ip=209.85.210.177 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="D9ppYEdK" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-84231305a80so359481b3a.0 for ; Thu, 11 Jun 2026 21:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236807; x=1781841607; 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=AtY9w5OLgbMDm1Vvzf6EQHSekByITXuJYckwU3WoHU0=; b=D9ppYEdKpEk8PyhP3Jjo5claDALHEl+T6hqDK020H52JNPjekbEcgXWoM0M1T9K/wU vd8ZR1nsz8qyxKs3i061NF7TzD9AjN97oJ7s+5rj72UidU521enngzpevT4MvSt2VHax MJuFvr+n8KdFhFf/ftq2OE8XH1qyTHTnSbQzJTEfhyDGPLk9XhJ3K/DdxLaSSDqVrvIb mLRD8HYYIla1m0ZrmJffx2iM3n9jclNasYmwzZ89QAn1vqpIgkZCcvU7m0sRba2xA5mi 6Xbyg9r+rZ4QMCrGaUhSWZ2Gq1w5aeGEEm81OLpJuK8nbXq2uq9+strNZ/GIeLl9csLE fUfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236807; x=1781841607; 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=AtY9w5OLgbMDm1Vvzf6EQHSekByITXuJYckwU3WoHU0=; b=brOMaGeXjC9MqKgdoqBZwarvGFPlc5P9GHVjbQLerUvcjFP4dBzC/gEINEiTr4vyQK vVdizbsLb0BJptV4tBo+6zrM7dImqOzu2twHKwFxHHz5QYlxjfnRTTd0mXM3oHOlJTNW flmhTgEL6jS/v97M7HgzWEnAIAuk53Azu1k5harFMtWJKBwobXQRZUAzIsoBqAolH3iQ HKCrTZQpcy8fupN+h+GdtKmMi7pK9+jtI3iXEdjYQgswrnZP5JKioogHmXgGC581AA8r IGfL2OGM1UniKwYSOfp3A5CJcbTBIOWppcJoqa5LEnbqciGOPeMFRn+BPLpEKMUZhYUj bZvg== X-Forwarded-Encrypted: i=1; AFNElJ9qMhwls7P2+p+1L2U2e201iQnuqz/0gjr+G6VrKbXzse+K9cXyeGeVN61wfgSKTz66au1YkoON6iWiKhg=@vger.kernel.org X-Gm-Message-State: AOJu0YycWdeb8xe1xuqFF5iaTLj2wyXC39N17p4b7w956DAz9R1HV1+3 ie182TVMSIEARJeNxbNwJIwUgm/VdeZjN0t8LxngECl8pYeyrGFxUp6Qs9U42VFIHL4= X-Gm-Gg: Acq92OFZ5ghBydDMpfuKImSLcvFEo5j9O9JsIcNpc5+w1NqRlF3dboVh12D33Zc1682 4qFDiRPsiNKerx1f2xYIlstLAeSEQRztKs2+K46SE0JuHYGPF71W6GzM0RNGNZ5rs14vWXOenL9 B3rEto5q3Y5Ui9Pd33+it0ST6jTeffLcfda1K0U2R0Jg1f0a7SEPUMBj2cideUmeByntehKeWDr 86xDt18I/AW7bjwglXXZocxu5iYhQs0FxYgRIY2qLsiOt93yh+PNniuv8a/2l5FvyLEkRRTFgMs TF40dasUov8l5N+18y409aSHELd9izm2ywH20YTVivGSQSuQpk8AUQm9TK6fz1NXP8ckxZyo+ts HD5QqkHAeqpBzvd+UIhUOyoyMgzmABS7idF6Vb9OVpSNqMkvW3W1llegVzqCqdEG+obFkQ7lizf OVrb/6Y9CCHGoPAZWGN1lSA3RF/AVA2AJj9kmTbIY6BIg= X-Received: by 2002:a05:6a00:2992:b0:842:5d9b:d590 with SMTP id d2e1a72fcca58-8434ce1c8c4mr1121632b3a.30.1781236807010; Thu, 11 Jun 2026 21:00:07 -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.21.00.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 21:00:06 -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 11/19] mm/sparse: Move sparse_vmemmap_init_nid_late() into sparse_init_nid() Date: Fri, 12 Jun 2026 11:58:55 +0800 Message-ID: <20260612035903.2468601-12-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 sparse_vmemmap_init_nid_late() is still called separately from mm_core_init_early(), away from the rest of the sparse initialization path. Now that sparse_init() runs after zone initialization, call sparse_vmemmap_init_nid_late() from sparse_init_nid() instead. This keeps both sparse_vmemmap_init_nid_early() and sparse_vmemmap_init_nid_late() in the sparse setup path. Signed-off-by: Muchun Song Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Oscar Salvador (SUSE) --- mm/mm_init.c | 4 ---- mm/sparse.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index a0eb61f9f55a..c76498b7abd1 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2674,16 +2674,12 @@ void __init __weak mem_init(void) void __init mm_core_init_early(void) { - int nid; - free_area_init(); hugetlb_cma_reserve(); hugetlb_bootmem_alloc(); sparse_init(); - for_each_node_state(nid, N_MEMORY) - sparse_vmemmap_init_nid_late(nid); memmap_init(); } diff --git a/mm/sparse.c b/mm/sparse.c index 324213d8bdcb..3917a47153d8 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -320,6 +320,7 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, } } sparse_usage_fini(); + sparse_vmemmap_init_nid_late(nid); } /* -- 2.54.0