From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 549D7216602 for ; Mon, 17 Mar 2025 05:12:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742188377; cv=none; b=jGuBlW95gplcny6waSa1a6kNkyJ5fVp/lDPZAKizugZQSnyX4AEcTLBSyJnwCuzdJ0j8qeXcJbpF3RN3HQg8VfsXLMupi5SPDI5D+HC9dgXiTpoXG65hEw53FQh6LMxx+9n4hHWsEj25nWblhIE/bNhzPFQw0+SLj2r6eg+ModY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742188377; c=relaxed/simple; bh=de45zPBngOzKV7reJENfqk4W5Dc/wg6XvWAdx57YQ24=; h=Date:To:From:Subject:Message-Id; b=f7WuLHkhU2+C5thB+05KhW+IuChR7AhI0TVaR6vNyfQaVQwPEGUIA5LXrvxTO8a7pihHvQIDol2yklXHTE7xHu2UUS/7Kart1YJc9rC1u5tfh6V47cnBQg7hPNa4n3kygVYvfBsBLuMjCmHnGQCfaxq1XO50T2Y5NVhE2JFKMPg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=MY7Nvrt9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="MY7Nvrt9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27CE0C4CEEC; Mon, 17 Mar 2025 05:12:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1742188377; bh=de45zPBngOzKV7reJENfqk4W5Dc/wg6XvWAdx57YQ24=; h=Date:To:From:Subject:From; b=MY7Nvrt9fB3iZM93qYROzX42S1FZ/TSxwZuZh8kNIyHYJ+AlB+M+hKjtYbqcTTRr6 2RJZLBVYMsSlCArUbwUeWOrWJUsWZiWKqLrLdBiOMUqpsCXMkEcUOnimylWJNC8/lW x5oyN13I+vPpBbVGBZGTmjY8G7toUWJvS8/YqdTI= Date: Sun, 16 Mar 2025 22:12:56 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,yuzhao@google.com,usamaarif642@gmail.com,roman.gushchin@linux.dev,peterz@infradead.org,osalvador@suse.de,muchun.song@linux.dev,mpe@ellerman.id.au,maddy@linux.ibm.com,luto@kernel.org,joao.m.martins@oracle.com,hca@linux.ibm.com,hannes@cmpxchg.org,gor@linux.ibm.com,david@redhat.com,dave.hansen@linux.intel.com,dan.carpenter@linaro.org,arnd@arndb.de,agordeev@linux.ibm.com,fvdl@google.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-define-__init_reserved_page_zone-function.patch removed from -mm tree Message-Id: <20250317051257.27CE0C4CEEC@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm: define __init_reserved_page_zone function has been removed from the -mm tree. Its filename was mm-define-__init_reserved_page_zone-function.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Frank van der Linden Subject: mm: define __init_reserved_page_zone function Date: Fri, 28 Feb 2025 18:29:13 +0000 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. Link: https://lkml.kernel.org/r/20250228182928.2645936-13-fvdl@google.com Signed-off-by: Frank van der Linden Cc: Alexander Gordeev Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Dan Carpenter Cc: Dave Hansen Cc: David Hildenbrand Cc: Heiko Carstens Cc: Joao Martins Cc: Johannes Weiner Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Muchun Song Cc: Oscar Salvador Cc: Peter Zijlstra Cc: Roman Gushchin (Cruise) Cc: Usama Arif Cc: Vasily Gorbik Cc: Yu Zhao Cc: Zi Yan Signed-off-by: Andrew Morton --- mm/internal.h | 1 + mm/mm_init.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) --- a/mm/internal.h~mm-define-__init_reserved_page_zone-function +++ a/mm/internal.h @@ -1449,6 +1449,7 @@ static inline bool pte_needs_soft_dirty_ 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, --- a/mm/mm_init.c~mm-define-__init_reserved_page_zone-function +++ a/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, u 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) {} _ Patches currently in -mm which might be from fvdl@google.com are