From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 5BC7C413238 for ; Wed, 13 May 2026 13:10:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677831; cv=none; b=FaO0s22evnSCjFltrHlfwo4ewogwlLr/39xPrboWJjKAOrADED5QmpaDeoDooN6ApXRqbU3v8AM+DBKnfA2I1OLVQdjy+EppXUEs8VoLcXcvesY21h2Mz0FFarLzG0nwuA4REm7Eh4sFAlZa4i50NUjieJDEOaZJkKIV4dEoPCU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677831; c=relaxed/simple; bh=1EQkJ7BfDc6qWLj5JHOkgT3du2QBG7fdelUx/1UJRgk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MMioF6zKI1skwtGgK1Dmij8kqL7WJxs/N5g0jwfog5BkEhrAyhvBEHJmLFTboXU+RpI15J5RMPkpmUt0uydT6haYS5/PYYFgtBuHPHhbMYYtMIKXZNkyZooCslDPHJ3ElqcvL2R3lNezu6qohZqYSp+SlyKtn1XrHO1L8QzcC84= 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=MzY8Dh/+; arc=none smtp.client-ip=209.85.214.172 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="MzY8Dh/+" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2baef9f5ecdso41265475ad.1 for ; Wed, 13 May 2026 06:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1778677830; x=1779282630; 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=u1XolciG0Jcg/XeXppdFYJHitey8LmRb9A3PbbH2+hw=; b=MzY8Dh/+QJg2UrQysAEjsFeuRcPhRCB//wcwSm+bbwVcEKEN14kH+dV8MpjkDoYkk/ A5+EZ7Tu7/KSiv8fyh3On7gozi1FTk9OG9kckC9G7VykTTE/dE0WqowTblPuhlDwroDn s2uHfWnpnCUHJmUIF50K8HsteYDPuqpHm+Zd2AiYfqeU2MHR+iSW3y8JkJOXZz3nTVmn Ko9UaRuDC14K/8ENRFqNyFM54aNXf+j+NRLrLuuWboghL+hp/lUz7NWM7ajsLPrsD6mN JkdcsaBrU2XBbCBM1oAWgxBlv3IEovck7dXw+wYoGltCYqlVfY+cnCbpvnvHrC+Yz+yv SYUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677830; x=1779282630; 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=u1XolciG0Jcg/XeXppdFYJHitey8LmRb9A3PbbH2+hw=; b=O9nBViFpZgPuXyeh4k7KTYYhrpnePnYRfRyNnoQHN2cPSgrdVxct3UMc9ClvcTOenp rlfzbQJY4ZwWdL7gcbz33nAuuO8oz/ppMnii6/T3H+hsxj/rVdZQ7DUiv3vZo/3hg7HR gLv0XyOW37JwjcpTDLjt9aqXQMBj2+Qwt7gNWZNMNEpH1dXYL309MMB+f4iG2EBoozHt 9iWu/2C5pD8ksMwKMgK+BH+BXWRCbRB1rVDR5cq3C7WIX6yl+h9OaEIO8GiVWydmChc2 56M5iO0BrLzJkeQXSX4j8k8bKmjYO1KNdHK1gU1xbXn9c6Ao0yQM/U1qLCzvZvJwlq3D nBGg== X-Forwarded-Encrypted: i=1; AFNElJ8++4WhmmgBfcZeVwn1QoZWYFDE+iOHoy9DIqdAwZUjjjAQFgOmFm4vDyUfai9XrnbfmIwP1Y25gl9Xsak=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2ZRqj3t3lI3z9fxS6kQWJVkoFhoP2STCVUgvPzZ1JTbjFciUE OdbOQlHXFp0peATo7LBhG9Je+AlMk1woU/PYlfhAqVRmTFom5Pvo9KNwgu8KLmMhiBw= X-Gm-Gg: Acq92OE0mca9LbKX49Mm3C4eOAvierNyPkif2xlef2lbSyRgookJlCNguQ3Om0NRsb1 fiQf5CZsves2MUjLvdrf2vh2qbxmmVZGn7GRSzsSWXYjbdlXmX3Xrn3Zh3m2oL5g6PEfPs/wt9e W5nWj0HeylNjxxHiy2pZK8l7zq10CHA/usTy2mu7RmrdKWxL8p18WfiCoxa99cZQ8QgOY9aP0Q8 e2TFQ/NovRD28e0OBytHpSSHfeoI9sh3bFwMAFwmSp+jv8uxcfSyZQdwFqI+O1Sl9AdrsGldEaL hxR1/rW9eS55bu48OjSNb0J2nrjAEcDIdeUZeQJ7QEtDAo4ouuLck8Sg3PeQxVsmrQI85WLZWYs Xm9YVwo50NMeFXZRw0F+JIs+ZbyeyI/gyXLeMlphJ2KMjYfUvK9fbne7pONLo9Mi8/eGykv/SJP D4hqjCThuI0GYNwvmJ3zp72BtpqwuPJoXcN+aG9uUfwag3TULigOO3wM7/DYI= X-Received: by 2002:a17:903:17c6:b0:2bc:8f62:990b with SMTP id d9443c01a7336-2bd2773e38fmr35514035ad.41.1778677829549; Wed, 13 May 2026 06:10:29 -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.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 May 2026 06:10:29 -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 32/69] mm/mm_init: Factor out pfn_to_zone() as a shared helper Date: Wed, 13 May 2026 21:05:00 +0800 Message-ID: <20260513130542.35604-33-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 pfn_to_zone() in sparse-vmemmap.c duplicates the zone lookup logic in __init_page_from_nid(). Move it to mm_init.c, declare it in mm/internal.h, and reuse it from __init_page_from_nid() instead of open-coding the zone walk there. Signed-off-by: Muchun Song --- mm/internal.h | 1 + mm/mm_init.c | 28 ++++++++++++++++------------ mm/sparse-vmemmap.c | 14 -------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index bf30617c78d8..18276cd15622 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1354,6 +1354,7 @@ static inline bool deferred_pages_enabled(void) } #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +struct zone *pfn_to_zone(unsigned long pfn, int nid); void init_deferred_page(unsigned long pfn, int nid); enum mminit_level { diff --git a/mm/mm_init.c b/mm/mm_init.c index 6723c604eefd..35c99e5c215c 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -686,25 +686,29 @@ static __meminit void pageblock_migratetype_init_range(unsigned long pfn, } } +struct zone __meminit *pfn_to_zone(unsigned long pfn, int nid) +{ + pg_data_t *pgdat = NODE_DATA(nid); + + for (enum zone_type zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++) { + struct zone *zone = &pgdat->node_zones[zone_type]; + + if (zone_spans_pfn(zone, pfn)) + return zone; + } + + return NULL; +} + #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT /* * Initialize a reserved page unconditionally, finding its zone first. */ static 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); + struct zone *zone = pfn_to_zone(pfn, nid); + __init_single_page(pfn_to_page(pfn), pfn, zone_idx(zone), nid); if (pageblock_aligned(pfn)) { enum migratetype mt = kho_scratch_migratetype(pfn, MIGRATE_MOVABLE); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index b86634903fc0..f1c3b2d0f23c 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -138,20 +138,6 @@ void __meminit vmemmap_verify(pte_t *pte, int node, start, end - 1); } -static struct zone __meminit *pfn_to_zone(unsigned long pfn, int nid) -{ - pg_data_t *pgdat = NODE_DATA(nid); - - for (enum zone_type zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++) { - struct zone *zone = &pgdat->node_zones[zone_type]; - - if (zone_spans_pfn(zone, pfn)) - return zone; - } - - return NULL; -} - static __meminit struct page *vmemmap_get_tail(unsigned int order, struct zone *zone); static pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, -- 2.54.0