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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD206CE7A81 for ; Mon, 25 Sep 2023 07:22:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EEF68D000B; Mon, 25 Sep 2023 03:22:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39F558D0001; Mon, 25 Sep 2023 03:22:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2670A8D000B; Mon, 25 Sep 2023 03:22:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 13D708D0001 for ; Mon, 25 Sep 2023 03:22:23 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D6D6F140AB7 for ; Mon, 25 Sep 2023 07:22:22 +0000 (UTC) X-FDA: 81274276524.10.1BB2EAF Received: from out-196.mta1.migadu.com (out-196.mta1.migadu.com [95.215.58.196]) by imf26.hostedemail.com (Postfix) with ESMTP id E414F140015 for ; Mon, 25 Sep 2023 07:22:20 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=oWZzBjTq; spf=pass (imf26.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.196 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695626541; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ap9IFexPW6VSs4Zh393WapxdcxvLLzkRsnjfydkgn14=; b=ynNXzESZ+KvDOmSL1luv1p90336HGNU9XbY3menaerompgEnguPICsLBpW996cIrAbzo1s gOFi+jjcGPHsYQvR0gKDxsT9v/chrNW7SSD05aY230sabPSjvVGvnrMsccAqenS+eKpFq2 CRXLC5rF0hT4bJsHu5WJ8z1w4AMa7N8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695626541; a=rsa-sha256; cv=none; b=56GPtN68PyUky+n8C33SHlrDkWJM+U3l2bwxrcrD01fuBEu19VIM5IG8uRxxp+zHG6p7WI A1bI2SEv0gSUytS7gliKfA6lp8mwfvY4PoD5SgFXIKFOzsdbffkUmu6DdfEUo+CSa6tHAV LegmXB4C2uRwbIrcnBjRouoSsnBXV4w= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=oWZzBjTq; spf=pass (imf26.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.196 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1695626539; 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=Ap9IFexPW6VSs4Zh393WapxdcxvLLzkRsnjfydkgn14=; b=oWZzBjTqSTsx/0+SzwtdysDcYfGjdzBEi1R4gwWgDhGCgM41rNFA3mAzsEL7wvoEofACNn oMuG7DdU8H6ETVNhQPl3bURePR9gV1bmd7YubvPMYOV4qF8g8FyNQV++PMvyV2jPTXrXw3 idhBj/s4YZ1VfE26hx6ol8MWNsrvfjU= From: Yajun Deng To: akpm@linux-foundation.org, rppt@kernel.org Cc: mike.kravetz@oracle.com, muchun.song@linux.dev, willy@infradead.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v2 1/2] mm: pass page count and reserved to __init_single_page Date: Mon, 25 Sep 2023 15:21:49 +0800 Message-Id: <20230925072150.386880-2-yajun.deng@linux.dev> In-Reply-To: <20230925072150.386880-1-yajun.deng@linux.dev> References: <20230925072150.386880-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: 71yz5s5r6ig7nwp3qmmwezebn6mg1unk X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E414F140015 X-Rspam-User: X-HE-Tag: 1695626540-252994 X-HE-Meta: U2FsdGVkX1++Ih0Z3JWtFs3VcbJ4erIZ5a+asQIkGHRQ8mhEvWPpQoPYQomBDV5qTF4X2HgwXaY6JZ1b5MJFFvuOfYuy33rPHtHDex07emUBNZadiMUK/PzW+t0+mgrUoDDmJ5t0jtvVcV4D/bM7Z2tNvz85A9R3+9VSyfCHmzMrljisb3addV+KAdDDZ2+oNDCsGdLc0nL54AE+pKean3rmUvuINt7dBSM0YyMJ/LVtbsERA3PROomkRZyJK2XOIUsNLtMqESfFz+zBu4AZQcglrlxBw48YI0Ij17PAQ+o6JNrbsaEgz19gWOZm1SMV5OjFSiiumqb4LX39XFueoGaH05NeaJ3OD8ak9o6UPwu3xjPYmal9aVVbhtkhqmD7nQDBKayouKc0d8PVy2RS2mjwURgui0LCdtbb8QZpYAuUHikFIQryq+Lz71SVTlp9bKmSmfZA78CTgXnwji191Pe45PYTa6rau0u3/xOxtN1DwH8pvJESdkYFti0Ix5tbhFTvnijT9s4Zb7lNTgezjJ+W/A+BGWnQmhe3jHw2qp6Wd8J6UgPYSUhGyUgyQzzCX7+UpHM7dbFgGhiOeQRFqcwO9xSGj5jhq94kDh61EExtX/pPO1Dx50m03Eer21mPuNtHQYtFK8voGQrWCMeI7Js1eWXQ+X7lJw6T83Oz6j+pY5Y1qiBMTdibQ2HsT9rlzlGUyQzGuvxhlQSnCiRAVHpzbMIqOa4uOeOV0gF5mkfNdSibD/EvyzeNqbBurzSxYLNWuf58AkwMNxhhP03rSFWnEdFN/rkKBDux2QufNFTjVS6cL3f3dGI99kW+HqqkaSv+ZdsIbiCxCimmwHWg0Auh7P1YF/28In33hTar7lsDNc+YbN04h36jb5H7yzUt1Tfq96uc76PrMUDiL1UIDPlv7rxo5pFZ2reM+sjt9yYj15BxwA7hpmSZaJj3TrzZc8zcP8N9KCdrMuremNB SI72W3T7 HRVzTmgByQ9cnIcpu009VK7S67Hj+VGDlno1BHf+BraIgxll/i5EF85xCGLxOzfUP3cMm3ZHvb2dzKj9ZcZi/M2L3oXd4MQBh758dyN0riQjK7VmqFKwOr5zAy2EVtRBvioZv 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: When we init a single page, we need to mark this page reserved if it does. And some pages may not need to set page count, such as compound pages. Introduce INIT_PAGE_COUNT and INIT_PAGE_RESERVED, let the caller decide if it needs to set page count and mark page reserved or not. Signed-off-by: Yajun Deng --- mm/hugetlb.c | 2 +- mm/internal.h | 8 +++++++- mm/mm_init.c | 31 +++++++++++++++++-------------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e2123d1bb4a2..b63635abe5c3 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, INIT_PAGE_COUNT); 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..e9366cce461c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1209,8 +1209,14 @@ struct vma_prepare { struct vm_area_struct *remove2; }; +enum { + INIT_PAGE_COUNT = (1 << 0), + INIT_PAGE_RESERVED = (1 << 1), +}; + void __meminit __init_single_page(struct page *page, unsigned long pfn, - unsigned long zone, int nid); + unsigned long zone, int nid, + unsigned int flags); /* 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..61df37133331 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -557,11 +557,11 @@ 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, + unsigned int flags) { mm_zero_struct_page(page); set_page_links(page, zone, nid, pfn); - init_page_count(page); page_mapcount_reset(page); page_cpupid_reset_last(page); page_kasan_tag_reset(page); @@ -572,6 +572,10 @@ 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 (flags & INIT_PAGE_COUNT) + init_page_count(page); + if (flags & INIT_PAGE_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, INIT_PAGE_COUNT); } #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, + INIT_PAGE_COUNT | INIT_PAGE_RESERVED); 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, INIT_PAGE_COUNT); 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, + unsigned int flags) { - - __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, flags | INIT_PAGE_RESERVED); /* * 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, 0); prep_compound_tail(head, pfn - head_pfn); set_page_count(page, 0); @@ -1084,7 +1086,8 @@ 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, + INIT_PAGE_COUNT); if (pfns_per_compound == 1) continue; @@ -2058,7 +2061,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, INIT_PAGE_COUNT); nr_pages++; } return (nr_pages); -- 2.25.1