From nobody Tue Feb 10 00:22:23 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 788B51E0DEA for ; Mon, 27 Jan 2025 23:22:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020168; cv=none; b=pdBbzqnvlF5oq7RVn9ITYsDRb05mGVIzN+MSGSThwNKy4ESyJgUkC4FBTZO77Yylj/iZcCrkwNR9IyXeaTfcccongCrnJcQDtMKoRNi7BEMV4ZO86HIfLCgEFINgv7a0n6HMnj5ha2DmiOuaq2w5gGGHlF3KRQYPCrvZGkcGa8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020168; c=relaxed/simple; bh=F1U1d0suBs4upbIvyU8zs6jNKjEaoO4dYrbC2u9MVqE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ofOx7JHVnQtSbYU1JC25twqjopsRwL2vr/j73VTw9GiiESj7p8Ol/Ucu+2Y78B//BrQxf20tGqDUNxFldc2CitUFbiGMEUzrixMYxsT7UzWLr12LvIHW0bfdZWAwfrgYx0U13r64XZB6VvA1rkK6C4vopeCx7JDT758YwugV6sA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gylPdyNg; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gylPdyNg" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-21632eacb31so63630625ad.0 for ; Mon, 27 Jan 2025 15:22:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738020165; x=1738624965; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xLt9HBc0qt/kG8opRR3xwjjIGa13UKxYV2/Ut2PpccA=; b=gylPdyNgxgQ9GnrZvXixjqb+XFWIGPH8unuojnvPrsO5RLzwQMLaBTC6P10pLBlWy5 U6Hl2HMHDUSuHuPnbpttyYCRReYOQpxwU5jN/ssAMp2jIkYdKO9pwo06DrO6yv/GfY49 gxDAQwSGXmYY7ZNGJSlHZ9OGnMTDWMvgG4CmjdDlIBvTb/zCsh66qN3E0ykNidmOxlrd BQdSH+b41x5KEaTL5W9e6VLAzLTeXb5j3DPyCD8Xm9P/MH7JQF7g23L2HF4sPPtYiU2r erdSKXnzOIQBMtiBdVZXTwWsaa0F0QA43oS5sabARASTr4KGneONp1eOzbxONujbsrf9 vk1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738020165; x=1738624965; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xLt9HBc0qt/kG8opRR3xwjjIGa13UKxYV2/Ut2PpccA=; b=RjunKcRpgU7TFzl8VFv4zmWj4Fsjw8ZoeVVmuUfl4zV7IvCJPt7P0X73/8pHUNE7ss Y2MCUDhyZ1fKwDUEnMDkd5zkRMypx3WD5fwYQpr0W+hGjWF+NlOGUVSEzZRGVA6GNdId AnicVeMUUECKS6zDiE5sBIQkCrxQ2dR//j3fGFB02dca5hgI398WZ2ds3tsWDe/aa+8b QCFYfTWhAtlB4ixzMqTLmN6Se8oWPA2yD4LHTzHTwz6j+ROnHF3TZW7DOMUhrJWbnaFd GsT760UOh5JAiHJ+8d/g+oTr14g/SqdL2Fep946B027Ow02KjbQUFsvmwZkktXcJLj1d SBbg== X-Forwarded-Encrypted: i=1; AJvYcCVFoDWwMPa9adBeyXHajfrMau85yPWpCdQ0Jo8W/O39rvTX/KP4gMbq/3UZKjFBzd2Mz9P30p/GNSQESbE=@vger.kernel.org X-Gm-Message-State: AOJu0YwpEGrm2eybDbUgokra0l65Alnlj9Sn2iGa4qPdvCFcTy91RcDX MrWSr4KselZXh5PHMmuXGLXJABH6AS1o3MY7OFIzj2ziqZ8BOm+keV1THSuqd+CeX2n/MA== X-Google-Smtp-Source: AGHT+IEy4AliGB/BJZg6HxqjwcmwX1utwC6DXZQSuAJ7MG3sxG6Hj9E074OSH8KEZyMN9lWrc3wMyVEV X-Received: from pgqw8.prod.google.com ([2002:a65:6948:0:b0:ac2:39d0:bdd7]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:7896:b0:1cf:27bf:8e03 with SMTP id adf61e73a8af0-1eb21585e4cmr64832659637.26.1738020164830; Mon, 27 Jan 2025 15:22:44 -0800 (PST) Date: Mon, 27 Jan 2025 23:21:53 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250127232207.3888640-14-fvdl@google.com> Subject: [PATCH 13/27] mm: define __init_reserved_page_zone function From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sometimes page structs must be unconditionally initialized as reserved, regardless of DEFERRED_STRUCT_PAGE_INIT. Define a function, __init_reserved_page_zone, containing code that already did all of the work in init_reserved_page, and make it available for use. Signed-off-by: Frank van der Linden --- mm/internal.h | 1 + mm/mm_init.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 109ef30fee11..57662141930e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1448,6 +1448,7 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_= area_struct *vma, pte_t pte =20 void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); +void __meminit __init_reserved_page_zone(unsigned long pfn, int nid); =20 /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memc= g, diff --git a/mm/mm_init.c b/mm/mm_init.c index 9f1e41c3dde6..925ed6564572 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -650,6 +650,28 @@ static inline void fixup_hashdist(void) static inline void fixup_hashdist(void) {} #endif /* CONFIG_NUMA */ =20 +/* + * Initialize a reserved page unconditionally, finding its zone first. + */ +void __meminit __init_reserved_page_zone(unsigned long pfn, int nid) +{ + pg_data_t *pgdat; + int zid; + + pgdat =3D NODE_DATA(nid); + + for (zid =3D 0; zid < MAX_NR_ZONES; zid++) { + struct zone *zone =3D &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)) + set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE); +} + #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { @@ -708,24 +730,10 @@ defer_init(int nid, unsigned long pfn, unsigned long = end_pfn) =20 static void __meminit init_reserved_page(unsigned long pfn, int nid) { - pg_data_t *pgdat; - int zid; - if (early_page_initialised(pfn, nid)) return; =20 - pgdat =3D NODE_DATA(nid); - - for (zid =3D 0; zid < MAX_NR_ZONES; zid++) { - struct zone *zone =3D &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)) - set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE); + __init_reserved_page_zone(pfn, nid); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} --=20 2.48.1.262.g85cc9f2d1e-goog