From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 C7EE93955FA for ; Fri, 12 Jun 2026 04:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236849; cv=none; b=krZijScPqYYXRTUE2Ffn5Ei21m8T0sV8Y3rtN/e/rfCuI+WYJGytFDW0lFPXZFFzorE5fwidvgsSIjv4GkUfi8hRfa1T7ANTLr/zZF/s5k0bretfiBgaUrDruLHauaWOfr0sTFi51njPF/RvqaiwTPBjIimk+g4cc3N6cPUMvMM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781236849; c=relaxed/simple; bh=vYYX03WUmIdqL32cX3amxfJTK15dbCd0l4lZODJ0Bew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G43lo/PcRweE8946JmQKnI+9eqHvm8b6cyUsFljRB9O9QQBnjkndQddEgGkNFhNfNh7JlRj4KeDpMlmVcqQP8+HHLMGBfou/EQvOQudyPyw3HMLSiH6j4yrmdQvjxvBnP4rORSu7VyqFf0KN01jT4eHfccCOxF2J9twppz+PRbQ= 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=h55l0B2C; arc=none smtp.client-ip=209.85.210.181 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="h55l0B2C" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8419ab3a297so274225b3a.2 for ; Thu, 11 Jun 2026 21:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1781236847; x=1781841647; 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=idHdbNQvIYMC7O/PUhqtBCVSyqTiFPMkYhoG6e6axFo=; b=h55l0B2CcB+BRgDqgkxPdYi6pjc5vwW4AfXEuFC6nmwwqr/jQB4elaj1hc7ufwxm9u mQ2gCM+P2XPDAiTUlMIxMLdsTBCCABggBmESQddfV8s/03DE+yFAKGAMmnK+4J0hwI2Q vwsmdhy6/XFWDnJS9T8o19dmZxiI+LlRxwBv2IN0giGOf0xwYFktQn09KiAsHKNTM1Q+ RkGJdBqSk1JwvTvP9iCCM1W8w7IBlnfdNYlbfFxxUdywTMMn9Ffj9kgHqfjU7c2ERTDW wjz1+0RRNrQ3qT3DBNUyUB/aGRJS1AB1q5n2hgFfxVDBcmK3hNoTUP1+zMqU/gMJdjlk Cy4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781236847; x=1781841647; 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=idHdbNQvIYMC7O/PUhqtBCVSyqTiFPMkYhoG6e6axFo=; b=H+lCAimlk9DMDssJlCwEQRU0oN7Cdh8eVPU+WjnGKCvNtl3QuZdcqYSrgr96X4gW5x QQ5D0afUfoTZ9ZeiJz77FDg6FcmQRzTpjWbPorDW8FoD8VxkEm/pWBBovUbg22YXA1kk shCQmV8zDAbZWd1TAeejVyWYLaJpLtkasJcVTxHJewYbKf2X2bAbV+BZcppQbieVS98/ /Q3K2sgETdbvn+KZ3TvObkGIZc6YhjX6KtqjNAAKaknZgVEucEi2QRa2RB4aZ+h1EVZG wI9TPzwY+O4LJpUZFx7X/TDHjWh3uqcdpNgAU4Cseamzu9kb//IwqvHg+b45rQ4Bg6I5 FIHA== X-Forwarded-Encrypted: i=1; AFNElJ83SkNcjh8jI7mAahdD2mqif/odpv/KAZND67o97IoDthFPhZxqH2Sy13/ZUQ1AU8ooQR/nU0NfZ4TLV5Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxXq0EiXX3NtJhNJgAylee797zlcMnIZQM5lGpN7LVvPwWjmDx9 JtwMIdXaRNuir7tNJZR5VdSicoQI9bEac3+dTBFKTaM3H2Ew7q0kby+gG0BE3X9bmtw= X-Gm-Gg: Acq92OH3799Y1CCCd0UaVrZEFfPi+S98KbgDPHgRQSRyNwtfPcOqUlCdPDEla21HsQR 3s0/Z9cBnDaFJm0kKKb7nDbbkyIQPlduI5CwfHN+m82HcGBrzh2srg14hE/zxrg12+BwoRKVCH8 p7GlmC49X3Z1VMCKU8gyzZ2VEC0cflLAnmp6FekuXZLWhWG1yosn2ZUUIZi280hKRf6w9c23Gfy 7cMfzgiHay5vWUCSPbcHwzOIPBUm11ly7auZUK0ZVSN0s38uu6g2j/IzMeV/3XdhHqcSwcseVnS iFJ9vQ6pbOACZXgiJCtp054D/oTtzAL8ELuHWND33t/YfKOBguMZeL2j9+JUE/SIzLi91AiS//u AMXo+pBlq9kU13cBKRbFwtpmaqk+RQHaITV+8+3OxhNwVuf4dFb+M49xvYBMXTFu+uOJ8xepBkY JsKW/tdrzapHeC2al767DXLBYDCK4ZJF5vtyuvRMBj46o= X-Received: by 2002:a05:6a00:238c:b0:835:41f3:f440 with SMTP id d2e1a72fcca58-8434cdfe0ffmr1116771b3a.14.1781236846941; Thu, 11 Jun 2026 21:00:46 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 21:00:46 -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 Subject: [PATCH v4 19/19] mm/mm_init: Fold __init_page_from_nid() into __init_deferred_page() Date: Fri, 12 Jun 2026 11:59:03 +0800 Message-ID: <20260612035903.2468601-20-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 __init_page_from_nid() no longer has external users and is only used locally in mm/mm_init.c under CONFIG_DEFERRED_STRUCT_PAGE_INIT. Fold it into its sole caller __init_deferred_page() and remove the separate helper declaration. Signed-off-by: Muchun Song Reviewed-by: Mike Rapoport (Microsoft) --- v3->v4: - Initialize pgdat at declaration line in __init_deferred_page() (suggested by Mike Rapoport) - Collect Reviewed-by from Mike Rapoport --- mm/internal.h | 1 - mm/mm_init.c | 42 ++++++++++++++++-------------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 39c9564fba0e..dc10291f14bb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1760,7 +1760,6 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); -void __meminit __init_page_from_nid(unsigned long pfn, int nid); /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, diff --git a/mm/mm_init.c b/mm/mm_init.c index c76498b7abd1..4026b084bd4b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -688,31 +688,6 @@ static __meminit void pageblock_migratetype_init_range(unsigned long pfn, } #endif -/* - * Initialize a reserved page unconditionally, finding its zone first. - */ -void __meminit __init_page_from_nid(unsigned long pfn, int nid) -{ - pg_data_t *pgdat; - int zid; - - pgdat = NODE_DATA(nid); - - for (zid = 0; zid < MAX_NR_ZONES; zid++) { - struct zone *zone = &pgdat->node_zones[zid]; - - if (zone_spans_pfn(zone, pfn)) - break; - } - __init_single_page(pfn_to_page(pfn), pfn, zid, nid); - - if (pageblock_aligned(pfn)) { - enum migratetype mt = - kho_scratch_migratetype(pfn, MIGRATE_MOVABLE); - init_pageblock_migratetype(pfn_to_page(pfn), mt, false); - } -} - #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { @@ -771,10 +746,25 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) static void __meminit __init_deferred_page(unsigned long pfn, int nid) { + pg_data_t *pgdat = NODE_DATA(nid); + int zid; + if (early_page_initialised(pfn, nid)) return; - __init_page_from_nid(pfn, nid); + for (zid = 0; zid < MAX_NR_ZONES; zid++) { + struct zone *zone = &pgdat->node_zones[zid]; + + if (zone_spans_pfn(zone, pfn)) + break; + } + __init_single_page(pfn_to_page(pfn), pfn, zid, nid); + + if (pageblock_aligned(pfn)) { + enum migratetype mt = + kho_scratch_migratetype(pfn, MIGRATE_MOVABLE); + init_pageblock_migratetype(pfn_to_page(pfn), mt, false); + } } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} -- 2.54.0