From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD7F2E7D0D6 for ; Fri, 22 Sep 2023 07:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230365AbjIVHKN (ORCPT ); Fri, 22 Sep 2023 03:10:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230332AbjIVHKK (ORCPT ); Fri, 22 Sep 2023 03:10:10 -0400 Received: from out-229.mta0.migadu.com (out-229.mta0.migadu.com [IPv6:2001:41d0:1004:224b::e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B66418F for ; Fri, 22 Sep 2023 00:10:03 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1695366600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k0mCgISWNiznjjM6SFzdDoz9gB321AuL+FXt04gr7LU=; b=jxWX0BgfnsPK+/UXL3X/EVvjG8BWDljXrq53ger1dOsqtFyF7Qy0lOSvvZlzrSxRGiowBX aZ+aCA1UetBKaJ3y1q6OBuvEv3GThzFUov3jfT6/IHSVlPKdHtoHot+HJ51tvuCMu1WOgT 36r5JuQY/7UoGeeVslveatFA3PqI7mk= From: Yajun Deng To: akpm@linux-foundation.org, mike.kravetz@oracle.com, muchun.song@linux.dev, glider@google.com, elver@google.com, dvyukov@google.com, rppt@kernel.org, david@redhat.com, osalvador@suse.de Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Yajun Deng Subject: [PATCH 1/4] mm: pass set_count and set_reserved to __init_single_page Date: Fri, 22 Sep 2023 15:09:20 +0800 Message-Id: <20230922070923.355656-2-yajun.deng@linux.dev> In-Reply-To: <20230922070923.355656-1-yajun.deng@linux.dev> References: <20230922070923.355656-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we init a single page, we need to mark this page reserved if it does. And somes page may not need to set page count, such as compound pages. Pass set_count and set_reserved to __init_single_page, let the caller decide if it needs to set page count or mark page reserved. Signed-off-by: Yajun Deng --- mm/hugetlb.c | 2 +- mm/internal.h | 3 ++- mm/mm_init.c | 30 ++++++++++++++++-------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e2123d1bb4a2..4f91e47430ce 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3196,7 +3196,7 @@ static void __init hugetlb_folio_init_tail_vmemmap(struct folio *folio, for (pfn = head_pfn + start_page_number; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __init_single_page(page, pfn, zone, nid); + __init_single_page(page, pfn, zone, nid, true, false); prep_compound_tail((struct page *)folio, pfn - head_pfn); ret = page_ref_freeze(page, 1); VM_BUG_ON(!ret); diff --git a/mm/internal.h b/mm/internal.h index 7a961d12b088..8bded7f98493 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1210,7 +1210,8 @@ struct vma_prepare { }; void __meminit __init_single_page(struct page *page, unsigned long pfn, - unsigned long zone, int nid); + unsigned long zone, int nid, bool set_count, + bool set_reserved); /* 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 06a72c223bce..c40042098a82 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -557,11 +557,13 @@ static void __init find_zone_movable_pfns_for_nodes(void) } void __meminit __init_single_page(struct page *page, unsigned long pfn, - unsigned long zone, int nid) + unsigned long zone, int nid, bool set_count, + bool set_reserved) { mm_zero_struct_page(page); set_page_links(page, zone, nid, pfn); - init_page_count(page); + if (set_count) + init_page_count(page); page_mapcount_reset(page); page_cpupid_reset_last(page); page_kasan_tag_reset(page); @@ -572,6 +574,8 @@ void __meminit __init_single_page(struct page *page, unsigned long pfn, if (!is_highmem_idx(zone)) set_page_address(page, __va(pfn << PAGE_SHIFT)); #endif + if (set_reserved) + __SetPageReserved(page); } #ifdef CONFIG_NUMA @@ -714,7 +718,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) if (zone_spans_pfn(zone, pfn)) break; } - __init_single_page(pfn_to_page(pfn), pfn, zid, nid); + __init_single_page(pfn_to_page(pfn), pfn, zid, nid, true, false); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} @@ -821,8 +825,8 @@ static void __init init_unavailable_range(unsigned long spfn, pfn = pageblock_end_pfn(pfn) - 1; continue; } - __init_single_page(pfn_to_page(pfn), pfn, zone, node); - __SetPageReserved(pfn_to_page(pfn)); + __init_single_page(pfn_to_page(pfn), pfn, zone, node, + true, true); pgcnt++; } @@ -884,7 +888,7 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone } page = pfn_to_page(pfn); - __init_single_page(page, pfn, zone, nid); + __init_single_page(page, pfn, zone, nid, true, false); if (context == MEMINIT_HOTPLUG) __SetPageReserved(page); @@ -965,11 +969,9 @@ static void __init memmap_init(void) #ifdef CONFIG_ZONE_DEVICE static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, unsigned long zone_idx, int nid, - struct dev_pagemap *pgmap) + struct dev_pagemap *pgmap, + bool set_count) { - - __init_single_page(page, pfn, zone_idx, nid); - /* * Mark page reserved as it will need to wait for onlining * phase for it to be fully associated with a zone. @@ -977,7 +979,7 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, * We can use the non-atomic __set_bit operation for setting * the flag as we are still initializing the pages. */ - __SetPageReserved(page); + __init_single_page(page, pfn, zone_idx, nid, set_count, true); /* * ZONE_DEVICE pages union ->lru with a ->pgmap back pointer @@ -1041,7 +1043,7 @@ static void __ref memmap_init_compound(struct page *head, for (pfn = head_pfn + 1; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + __init_zone_device_page(page, pfn, zone_idx, nid, pgmap, false); prep_compound_tail(head, pfn - head_pfn); set_page_count(page, 0); @@ -1084,7 +1086,7 @@ void __ref memmap_init_zone_device(struct zone *zone, for (pfn = start_pfn; pfn < end_pfn; pfn += pfns_per_compound) { struct page *page = pfn_to_page(pfn); - __init_zone_device_page(page, pfn, zone_idx, nid, pgmap); + __init_zone_device_page(page, pfn, zone_idx, nid, pgmap, true); if (pfns_per_compound == 1) continue; @@ -2058,7 +2060,7 @@ static unsigned long __init deferred_init_pages(struct zone *zone, } else { page++; } - __init_single_page(page, pfn, zid, nid); + __init_single_page(page, pfn, zid, nid, true, false); nr_pages++; } return (nr_pages); -- 2.25.1