From patchwork Tue Feb 18 18:16:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13980411 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F2EBC021AF for ; Tue, 18 Feb 2025 18:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19275280180; Tue, 18 Feb 2025 13:17:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11A186B00CC; Tue, 18 Feb 2025 13:17:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6523280180; Tue, 18 Feb 2025 13:17:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BFEA26B00CB for ; Tue, 18 Feb 2025 13:17:28 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7F31D1403F1 for ; Tue, 18 Feb 2025 18:17:28 +0000 (UTC) X-FDA: 83133872976.27.A874A6D Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf02.hostedemail.com (Postfix) with ESMTP id B372F80004 for ; Tue, 18 Feb 2025 18:17:26 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KecNygcE; spf=pass (imf02.hostedemail.com: domain of 3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739902646; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=m+bEnmjPKM2LR+F4knm59MI5kARgbyIlYFpe7sPbreNrny9VU3MDOpJl9WqCJUIHX7r93G VE67H8rkFGNWWfHmnHKEOa0OL/xMMzsy5zarwtoGWYMoq8T4/TnGO6XJ88RMZ4j8d0yuXk OlOaJQ0pkZdHmrQO5dlsI6W0XEb3cwU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902646; a=rsa-sha256; cv=none; b=NcqC5C3HuMa0rvGsB4kok9nLe6C4Jh1wecvVZbm1u6kWrVhGjzs3xTXB9Icex+WedA3UGv 5I2vZYLvKOk0pPU/5alrFB6ZoESBKnu4Mn665Oon9U9+CBMQLxeBTAq20xvr9zD1eZdP0U KkcHwvbmt0t3hOxH/lEhJSu3Mnsx+yk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KecNygcE; spf=pass (imf02.hostedemail.com: domain of 3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220f0382404so88270405ad.1 for ; Tue, 18 Feb 2025 10:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902646; x=1740507446; darn=kvack.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=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=KecNygcEwhh406WuK/ZBFaGhZy8FMWjVvWsBh03LQN1q3ftMldluA6NEHnGQPAbiR3 f2EmmCUq3ogf1kY8pdb4x4Hj9nSCcI2mFWJO0c7fYa094X/k0zX3lClF0ZpGJqEnB/Ei am3917BKjYzD2oGIqg99eqiiiNBOvMpqVyUwjMfrMqQ8RGGANNoUdnCrxuQN74Ffb+kt 3eZXDEp5Aw3tJLnoAPvZA8vBZ/2h7ZpqKjPWTlC/aprm6g2Zeg3EfxDu60qBa880Oq3F zr3nMkzPUaJo6TqfdcdmoDCwZvESxno11aD2HvXTcWVGYhCg2qDyfBMAf0qFhgtKISpk 1Tvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902646; x=1740507446; 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=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=NpLcWbxU2gnexB+jvXORdqkfIDQFSae2Yzl3++NZ/q+O/mbK/u/rR+zjl+Ai5p6AWy MMGGyEa3orTNpUNY4bzngnvbPb4wQnSUOjFAG28PjKyZLaQbfQRYUTrtF3GcbjoruibB tpMTxCUQa+A5AvmV7mD0sUy9GExfDInz2geZEzj5wSfPC9n3FEBJrNfdOBbPcjzSnANg nEwmdcBHh6o7wgNY0VSLKtIuzb9e46IywO3EF5yEzDef9tn2lFYsfTNiqpMR/JEIagop Skn0c27Hczqwt8Rz8zjcUFDK/FxYbCFnDIA/K3/Xdws0wlcbThd8kfBoXXqyT/pVCOAS Oxrw== X-Forwarded-Encrypted: i=1; AJvYcCUFgMuDKyQYOl8LsysfVg2AGGiX/xY2YWB8wHGZLF/TkHntoHV7Y8GHbUpiH0n/nLXvY+TSJTLLGQ==@kvack.org X-Gm-Message-State: AOJu0YzrlzMKVPchf0Uq906z0MzW66Vu/dhupRuSAj4md3CfAjP48izy p+dWaXelP4ZXnrV2oBqgIsgMhL20kYH8ByAwCqtLFXlBxG5VUjabFpS2ZVi8nOYELYkHZQ== X-Google-Smtp-Source: AGHT+IFvSNPdBbepKEoVoWi1qQOaCYkORgQpakxpUeNt43f5okQM/hLmZPRepQHlQe973YIHv4a3xcRy X-Received: from pgbda5.prod.google.com ([2002:a05:6a02:2385:b0:ad7:38bc:1096]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:999e:b0:1ee:764b:ae2b with SMTP id adf61e73a8af0-1eed4ff48b2mr424330637.27.1739902645700; Tue, 18 Feb 2025 10:17:25 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:40 +0000 In-Reply-To: <20250218181656.207178-1-fvdl@google.com> Mime-Version: 1.0 References: <20250218181656.207178-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218181656.207178-13-fvdl@google.com> Subject: [PATCH v4 12/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, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden X-Rspam-User: X-Rspamd-Queue-Id: B372F80004 X-Rspamd-Server: rspam07 X-Stat-Signature: 65j3su5b74t1nnkp4cju6w3ck883o9h7 X-HE-Tag: 1739902646-708003 X-HE-Meta: U2FsdGVkX19YOeQkUb9ve9ytjigXZ4qCysMUPje5e3a6kjTAaJ1fycDGBy2PXeM/hI3q3CIVj3yw33oia8HFf5qmaw7a6CrAjdBghWxpLur5iueCMU8d6x64wdBYeWaDJxLNFQia3cuVNBOMxDJ6Yff6LUvbhkuNSSbvB3tS6+VcZEPRSQLJlJ2UcOa0O2z3ycSN8eaAleHDZyylYiLxqqS43dMALzH1Pd56YKX3y0spgAsqObSq06R4lszZ3oXWrjMFGDeEtIlOsgkqTVCk9ktiPKFTc+PBrdOUEsEKmXAxlnGX3t417HuACctkym4k13lCXcf5iQP/9Xp7gDobND15vFpHsVx5Ec0S/u+9EISJjD+p5fr17sE10EANQL9UdKg+nXnmnB6eHqHz2pEP1RdjVl6zzNatHR0Jivyi+PCpL2cCAbFisZWOAF+/tEs57Pc7ml8MfBPo2fZjkYVvZUS+XR+ZZ7TfUxqgzX0+8eAYGZ8Lq0fE5+Yih+40Q2TF0HLbXGTYPpxV0nTaA93PatzyxwHU08mUNIDgMaOV1eTKKZWXo42Co/eJW/v6ifsOUtIJGZNJ2h6eP/fCUidpcGjMHLVVBaAgSGf9eZTEvKVvNj+Auc+B6F7pF/0ObdOwfJM1HV8+UiPkRdi1DPY8ZOiVopiqHYpjOrxFSexP1of0C/3etc+ovSI+H6O5YPGLJr/PBnRMWy/99cZ7xMCJRzobXk2la+V4HRffZpjGc8RirvyaYC1WP2dhzCpaX2txOJTZutlTxDkijybhzKBLj4jDvUE0GPWk5N4qYgzilUhmswXdUgfaZe2lhT0pTOiPPdx8MzFRYDd0UwONgKpRrl4u/TEPbwnBGwh4P8qxprNc842FWlgHkHbXSF5q5e+CGMBPfdtMCgGX7f+AUG9LlDoKUBWXy+54damxk8Olkgr93ECgDbeF5FZRHD9I4ltmbY6rNfGsQ0T8unNuhO8 TyAV4aNX LgWgH59ad4KRq5i0bcsDHPqjGcEr+TYmrweO7bCUcIW86yZU94ge9aPf1MDlHBOpWYqerTrpJa7hAGjYI7qomfrJbMq1KstYL2fQ3ZomY75D18gcrux0cOGGnQtZaGhDwVA+PEkfvTgV7dqrtzhpDcsQLntWP921J60BayR1oOLI3DcUQDcaYEBj6FpcDhE4rrSHhe7DsKj1G8nJGgFIWAUs+TXuc4zf7gybnFKSbkE4JwIKwxpROjUYRmMKotMW3lJvrJkwXj1usmFGG53pWCnHYgUOnEmcf2Xc13SCMoRj6Gs8W/vnxvw3By26mQ9L6faDqeQK7SFKu1axFyeHYHO3BsdK6CSSWt4jkFt71FzDIPgZ8vWF3cj0dUsnE5NFaurYqsMQp3jHPSbtsvuyoQGrO79OnXpdcQXZ4+H+zJnXA2F39uIeehctfzT7RNxGOcidiZ3t/+02h4Vl0Mu2Yu26rnuL3r/BeuHCYdZlmnFgRBRRfqHj/yVBG2v+gZtSQcQp7aB0MHUcgLn0zZBJjGLkAxYQF2hUWKp6D/cLLthU+rBiczMmgvpQg0Z+ihtPznpYTLs2Yul+mdWpGfqB5Q8wKOKBOdGmJyvS/Mn9zLFSwK2w= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 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); /* 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 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 */ +/* + * 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 = 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)) + 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) static void __meminit init_reserved_page(unsigned long pfn, int nid) { - pg_data_t *pgdat; - int zid; - if (early_page_initialised(pfn, nid)) return; - 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)) - 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) {}