From patchwork Thu Feb 6 18:50:53 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: 13963576 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 4FA55C02194 for ; Thu, 6 Feb 2025 18:58:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD8436B0096; Thu, 6 Feb 2025 13:58:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D87EF6B0099; Thu, 6 Feb 2025 13:58:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4FE06B009A; Thu, 6 Feb 2025 13:58:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A655A6B0096 for ; Thu, 6 Feb 2025 13:58:35 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 460E2465CF for ; Thu, 6 Feb 2025 18:58:35 +0000 (UTC) X-FDA: 83090430990.26.D976D35 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf30.hostedemail.com (Postfix) with ESMTP id 70FAA80019 for ; Thu, 6 Feb 2025 18:58:33 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Q+qSoiUh; spf=pass (imf30.hostedemail.com: domain of 3uQSlZwQKCJo9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3uQSlZwQKCJo9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@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=1738868313; 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=N1nizw8LTgFJ6Hunu1baoXowLm72wInJnvRTI+vB3dI=; b=hK05sxm0Ytz+fS0cpCmGFzodFEAU4vpLbYaGiJtXpGwB07/8lY+vP5oUGM3HPlrNF9vvPB Ncn8RIk4FRIR96yJBxeEhRAUqBNHMqmR1k823tgzujcvFqeyHBjaqJcaeL5ii9H3K3mFyM usi3qv5TmlXJi+a7GH+UJqTwFPiSewI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Q+qSoiUh; spf=pass (imf30.hostedemail.com: domain of 3uQSlZwQKCJo9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3uQSlZwQKCJo9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738868313; a=rsa-sha256; cv=none; b=SKm2h7PoUd4Uxs6G8T81t5f30xzlzaQu+jU863ldpU7disfEdImb6QarLM1rer/8dik1CQ 656iH00i1hA5MPETmeQmoll+QNuO2cVKuGOgzNYaFd6dCGqd2d1U0dR8EspNwNSX6NMYlc xdv4LH6nG0LVYiXvpWuZgOGBfcpUk6M= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2163dc0f689so40538025ad.1 for ; Thu, 06 Feb 2025 10:58:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738868312; x=1739473112; 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=N1nizw8LTgFJ6Hunu1baoXowLm72wInJnvRTI+vB3dI=; b=Q+qSoiUhM676fV/iBCZvQTb907b3TPTZ74vBAOsMVS3I+EuaMAzmpptIXLsb3wLeI1 u/FbnPO3/iw5/pJgsSqTuNnfN6388R1bqs8+zfG8ThEJYSHdwgx4fg5Ya1kuiPpBEuVb YK6nhcY+3PSMdzCYxdb6tcJeC+i0h9Hui2qmuGv1j+bT+g2Hin0r/WLmJC7DozbN/YQM wR4SWh+WWgBYKXwqDWZI5KpaV3ECK2NgYKUOptM0xlElAXgrpZ6VmaGJCWEmaW0m7wfs dChamDkBsUUIdFfF4OaFIfl6olY0Ig3rcIMkIpuKPF0iMPx50Zqmf2E9ebHODAL1VuM+ Sf+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738868312; x=1739473112; 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=N1nizw8LTgFJ6Hunu1baoXowLm72wInJnvRTI+vB3dI=; b=sXWfYPJTbHrbHZP3kVRpihIWD8SO3NcscsMZaIHmi8fsjhuMANpwk3E7CQoIpxHoDM qsdalWAvAaJ5Ws3eA/SYT6sN9Ye2n4p5v69If4WAKYV5G74EaFStsAb3QZVenx/pFz6d 9XS7fiRMahkqpnL0N11+EHWC0uZ6jQT3VXrU22a82tjCQijatkDkc12AvGLoKv6CVXZu nqxK6mWFB8Xxfe0kG5TD8Kqe8kiEdgwPQvcizhsrB9q3834+/foQw2Je6f0HRXrg5ROe cCadPnGWgpaBR/dw5EyzLZaKF+FBsnMKKf+J0x0UC90fPwjavWdth363ZB5ba8YI8ILf xqMQ== X-Forwarded-Encrypted: i=1; AJvYcCWeu4ppXOqN9Qn6scWaV13Y/35u5NzV5H1Q1FMmlIcI7bB6rEuzGQdbH6YGPfhJt028kHN94CHX+Q==@kvack.org X-Gm-Message-State: AOJu0YySU3zjqq+NuXL0TEsHqHzrkWxtwguqrfdkNc4f41iB9t5FxKdR Al/12PHC3RutWAqMzPN7fQ8yQmcVttMjYP40t9vITqTFfwNsW8OxRBDGQ8x2slgS1GDeeA== X-Google-Smtp-Source: AGHT+IHCvMErKFRJySbjcM7qJ570UaYkF9tu8lbCYFmm8LplntCVFlwxB6ni+y+lUDS7htgcQtwDW2+L X-Received: from pfwy2.prod.google.com ([2002:a05:6a00:1c82:b0:72f:f548:3e09]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2d27:b0:1e1:b105:87b with SMTP id adf61e73a8af0-1ee03a8f413mr928165637.23.1738867897906; Thu, 06 Feb 2025 10:51:37 -0800 (PST) Date: Thu, 6 Feb 2025 18:50:53 +0000 In-Reply-To: <20250206185109.1210657-1-fvdl@google.com> Mime-Version: 1.0 References: <20250206185109.1210657-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250206185109.1210657-14-fvdl@google.com> Subject: [PATCH v3 13/28] 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: 70FAA80019 X-Stat-Signature: s9prk1wqog7u4xm1mdjp5ahywdbu7ee6 X-Rspamd-Server: rspam03 X-HE-Tag: 1738868313-471881 X-HE-Meta: U2FsdGVkX18mYBAizZwAtH4ohHHppjYQg+XK7jd48I9BCp5TirpX9Xm4x/wOPdTiwa8goClLIKesv+ZLjNUXoyvQKEmwN9S+hnVEwDAMhzeOUc10cA0xVt1oweekAtLqZg0ZF/kSAzK+EXZ93RVpGsush5fp4wZ9XHn3SQ9Lg4m47NgmsQMuImV0Hy/enfIzilc4BggspsSozluv3HVDg1ewdSSdpDQHEy9GyF2ZqiWoatDUkaCSiudKKEFL7NUNluMjVN9/Wn60IHSuvwjbaA6snGRHKcFqUBQWphwS7kobjDk2l5aqWjspU2j1TUATwALJ9Y93ZwV6dGOlMQ2r0khZx2bIG+yX4Kwa8sKrHmYph5dYCpuBDEBbiWcrpmIU/M/gBdgsHD1G54Jm1/C9p0bCUweWyoxeelg7iGpe5XoGUpG9Dw6fNz3w9Lao+WR7CT0yCMFqrgOgXFRvCU542llS+oGTs2Wm7an02BgrvupwKVTk9j28ktc0Ol8Z3W4WKPjtXVxzP135ZhIz3OptIOPGB2mXP6hO8schBHMYklEPZUgmVkNk2MPPVtAYudNbe0tSQHotyAX4RJlR43clPidWF5J/8NZUFfNIGNsEDX6wDcFPDnY7+VhflJuyZVpXx7O2gsDyFWI3vlgMiC8CtxX+8kbXn0QENGlpEe8YayMfiuW0XpXKQeylS78L9lz/6cj+kMpJqbtVQn/gK/bC90WdiiF4A+JCdDzn2Mq3/B7cfgS3EfMXldA47p9WLZt3PMIlpi32pXtvPt/jwGs1aCIS+TW2MrYq/Mz7XgAlhMCJC3I336kRwTZS8kik3mh5UFuDypaXqBaaz9NMrY4AVReVx02ya0nkb5STcrc/WMUnlw44bscDeo5GRX7SUn93g7VHQ/muKvTjGSk0NS8vN7qx/V3KAnbuEMCFZivUFy5kKgMdVeJhImsKFXIkokfkE/bNmJkHi8e7BGDtRQv IC76ldz3 GNprYDTyeXYU1DldGuxbb8R+UxlIYWma+BhWDNY+cGZrfZ9P/v9WTHeuxq9NrrEjz4cZ9fzJgHLsb/neLv/4yriMC4p7q/rHqsAFtDJGJGuR3XDKFwuTk6WuwQpMNFg2efzk38OrmRIGrQAVfkHcr9gaFOj1c0oCbIo0Aj9lG8Kx84J6diIHB+0wVCIqJCb6QUTZsNNJKsnhG94xiTE9VsyHLjX4fKUpjGrdSP5TzDMFjXVSXNMEF+Dcc6p3TeNp8YnKYtIw3TW31butbv97Vg+tqwA3Pq2WCcUpjuC4oygtZMCxUUdhyyis2Rznbe6fmskthCnSuOJ+CIfsY6Ap9HRVOHWTMXBYJu0C2NXWEpw9a/raywbWZqR/ZZavg1SGmpcETzgbTmiXTMyv6S1qlN1yA9TSKTTvJUfpvCFYSj2OzuJdpm4EsYhbQ0cjS7D13eN7LNeudT7BNuu9Msk7CFUuxux9MD1JUSvnfx/prcpMALvMQaROa+sav/8SehTISHFO0taR7K4/jAz8GPOWE2VwObVMGNsc+wvUiD35upsEKaju2hAjyJiGhHfSdbHZyOq8RsybgOjJpsD7z1pE99GNaRANo1tNqnuxF6AD3Yj/ZWi0= 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) {}