From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 DFE9F3D45F4 for ; Mon, 20 Jul 2026 09:32:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784539938; cv=none; b=kxCKMt6yUnNLVUVzwcRXm0gKkg+z0LfVQpL4L5h4h0/tXp11ws7teay4aUhFBw4xkySmDRLVbKQZ7F8ji8Vw9eDX12tPv7ix8c/yx+pY8bNEsj+JkNQ/Sm2+f5J07Qhr0su82Ljv9F8FHh+ypjVBuRpUMa+2j8v7pMG3Ce2HLC8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784539938; c=relaxed/simple; bh=ynRjGf/9kUBaaReEwOGUp45Yp7rWP1SzjJfyEbOWZy4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BN7D5XqRVbO8MIxgtHLicK5A0+6CiHB74KxM/WPFhPnSeT72mn/x/OJ02OVjQHaoG1co50wveSgeQUaVEXlT3AfzZttt+uSWDTzyupKtESwJenkCL9asnREOW9C96ZgrAE6sdQX2/rsxfEnLMaNMLzuteB9xWBTJqoWrQeW0zx4= 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=NuImI7QK; arc=none smtp.client-ip=209.85.214.176 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="NuImI7QK" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2cad4170e8eso134031015ad.3 for ; Mon, 20 Jul 2026 02:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1784539936; x=1785144736; 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:content-type; bh=MkBZ2UA32uh7FYNyMozkAkSKVt/rRvYA4e3apZ5ZvVc=; b=NuImI7QKG+nH8eQnZUm9QfPsrU5GjvstNRMF1TcsWM9znlddzaJY1TQRW8xBDRtihd bq6wGAusyiSnEbSPFczb+Lz8mebwlJGuDfoBb9QmNdkuenJ1VvW6xfJ6kNkS8Px+epeS NNFMO/RCoeoB3ntiBtwOP1SpvbwSx2jpN5upNvkREpq9xv8hz7ox/MQrVK/ETCx6MYZV WvMiRytergaDQ6LevNQbMEbhZhXhLb2pGOLKOlVNIwatZ+cTPPJ3nauWoau/oLmXXQ7N tQPd6bsqvGi0V0C51JjjUEhYFpgEMeSxGPZVzcwcG47mr7Lpy+Cpt11+MRpQBfgs/1lU hCug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784539936; x=1785144736; 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:content-type; bh=MkBZ2UA32uh7FYNyMozkAkSKVt/rRvYA4e3apZ5ZvVc=; b=U3sw2yEeH4zIrmPdtz7ZKlfeVCSWLAUpGozZLyNYd0wJHITnOvHa+VFckvTvRetl9d nxX7kcRtlJZAy0jtP1uq8i6rGcRBLUsGiYD9OnDpLLmCENO8IxUg32atdDaoPx+694NK oAQHoFSKZMU2o9pLsi5zYkDnSEBACTPIEo0vXeLhQUl+nc/N5YkuiqqvJoVQielouJXY Yekb2QaROtjmGf2TdJBSxzNhmjZee4ZtLRUBJ5xanztoft1O+o1rIkOOlB6ZGcU8dJTC XJEH0lN2ImHyBwfHzI1d4lrHdvzEX7ACppA4TCENJFgh4VjPHicnq518fpbKksOQkqZh c+Mg== X-Forwarded-Encrypted: i=1; AHgh+RreJchO8FuAaTz1h71H/YQr2YtsylLSSiI8dtJjQfkZc8E9DNVArskJYdVdsFoGSj4QMOg8Ca1OL9bb+jA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyb0gEh8eTD7YUGXYPbETVWd8h+gh6xWwtkuM25+goqMTuj7jzj j6D9U5Cq4uhZe/92bU7uofexDT1Mt/O0lBf4yJXjefQSuIub1cxqdJyRi4ws5ZpgYFA= X-Gm-Gg: AfdE7cly3hiGRsSpQ1CVusizl/foLB9UH38z45W0l7kvo2VvkoiB0vixCfwu9YBhqrd +eB+w82sGXYwjLKjVScHOW1UHgzn/BiX5Yf7NZ43lEWhQHHHJtuVHXSA+Pc/kn5P9rnYf15ZOJO 1nhE0PUtS+6PnCYMreOOnI6+y6JSnWUhpeecN6SaDy8Kb5zcEz5TLudz4pB7NQ7SIjkmb3Z/Myx oSYkYmmix2yXuaoWdFNAP5iRCHxU3enCNX6zRwWfOATxq4HEw+TWiKva6lavT2TGpW99++WsdEx knazBei5YL+kf/sG3vlj2bqo6LIPPCnTSaKAwltYc2akcaHPCsBYCKLMLs1WnZrPMS7qu+oofma h/ENjbrDS8m/xLdNH+YANI+sPQPJ7zc1AZqjJcEvE70YYySKf8Nqx8Bcmk6658ZDioX4tboA0pU TNwgRfX+CQUZ77WpbGy/7pgJs= X-Received: by 2002:a17:902:fc85:b0:2c9:bd37:ae76 with SMTP id d9443c01a7336-2cf34a3ef59mr151673285ad.47.1784539936212; Mon, 20 Jul 2026 02:32:16 -0700 (PDT) Received: from n232-176-004.byted.org ([36.110.163.101]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf347a7c9fsm53136455ad.84.2026.07.20.02.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 02:32:15 -0700 (PDT) From: Muchun Song To: Andrew Morton , Oscar Salvador , David Hildenbrand Cc: Mike Rapoport , Vlastimil Babka , Lorenzo Stoakes , Michal Hocko , David Laight , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Muchun Song Subject: [PATCH v2 06/17] mm/mm_init: factor out pfn_to_zone() Date: Mon, 20 Jul 2026 17:31:16 +0800 Message-ID: <20260720093127.540540-7-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260720093127.540540-1-songmuchun@bytedance.com> References: <20260720093127.540540-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 hugetlb_vmemmap.c duplicates the zone lookup logic in __init_deferred_page(). Move it to mm_init.c, declare it in mm/internal.h, and reuse it from __init_deferred_page() and HugeTLB early vmemmap initialization instead of open-coding the zone walk there. Signed-off-by: Muchun Song --- v2: - Move this preparatory patch before the sparse-vmemmap optimization changes (suggested by Mike Rapoport) --- mm/hugetlb_vmemmap.c | 17 ++--------------- mm/mm_init.c | 28 ++++++++++++++++++---------- mm/mm_init.h | 1 + 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index ae8fdaa42118..c48fcea076a5 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -19,6 +19,7 @@ #include #include "hugetlb_vmemmap.h" #include "internal.h" +#include "mm_init.h" /** * struct vmemmap_remap_walk - walk vmemmap page table @@ -744,20 +745,6 @@ static bool vmemmap_should_optimize_bootmem_page(struct huge_bootmem_page *m) return true; } -static struct zone *pfn_to_zone(unsigned nid, unsigned long pfn) -{ - struct zone *zone; - enum zone_type zone_type; - - for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++) { - zone = &NODE_DATA(nid)->node_zones[zone_type]; - if (zone_spans_pfn(zone, pfn)) - return zone; - } - - return NULL; -} - /* * Initialize memmap section for a gigantic page, HVO-style. */ @@ -787,7 +774,7 @@ void __init hugetlb_vmemmap_init_early(int nid) map = pfn_to_page(pfn); start = (unsigned long)map; end = start + hugetlb_vmemmap_size(m->hstate); - zone = pfn_to_zone(nid, pfn); + zone = pfn_to_zone(pfn, nid); if (vmemmap_populate_hvo(start, end, huge_page_order(m->hstate), zone, HUGETLB_VMEMMAP_RESERVE_SIZE)) diff --git a/mm/mm_init.c b/mm/mm_init.c index dcb757b36902..191d4ebe9314 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -690,6 +690,20 @@ 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 static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { @@ -748,20 +762,14 @@ 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; + struct zone *zone; if (early_page_initialised(pfn, nid)) return; - 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); - + zone = pfn_to_zone(pfn, nid); + __init_single_page(pfn_to_page(pfn), pfn, + zone ? zone_idx(zone) : MAX_NR_ZONES, nid); if (pageblock_aligned(pfn)) { enum migratetype mt = kho_scratch_migratetype(pfn, MIGRATE_MOVABLE); diff --git a/mm/mm_init.h b/mm/mm_init.h index 39f75df9be1c..c9fc35e7e9f1 100644 --- a/mm/mm_init.h +++ b/mm/mm_init.h @@ -39,6 +39,7 @@ void memmap_init_range(unsigned long size, int nid, unsigned long zone, enum meminit_context context, struct vmem_altmap *altmap, int migratetype, bool isolate_pageblock); +struct zone *pfn_to_zone(unsigned long pfn, int nid); #if defined CONFIG_COMPACTION || defined CONFIG_CMA /* Free whole pageblock and set its migration type to MIGRATE_CMA. */ -- 2.54.0