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 4BF4FE728CB for ; Fri, 29 Sep 2023 17:01:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C90508D00F1; Fri, 29 Sep 2023 13:01:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C40128D00E3; Fri, 29 Sep 2023 13:01:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B08278D00F1; Fri, 29 Sep 2023 13:01:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A03D98D00E3 for ; Fri, 29 Sep 2023 13:01:03 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 682B0B4503 for ; Fri, 29 Sep 2023 17:01:03 +0000 (UTC) X-FDA: 81290250006.27.392BBC6 Received: from out-209.mta0.migadu.com (out-209.mta0.migadu.com [91.218.175.209]) by imf24.hostedemail.com (Postfix) with ESMTP id 405EB18001D for ; Fri, 29 Sep 2023 17:00:58 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=FvBSnRod; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf24.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.209 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696006858; 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=Me9MAVaSpVROGgcWoh0I/C8teSI+rjxEqbPFaHRKJ3g=; b=gvWOhYLgj+D9V8y8aU87GIouhh5uKLXKdUnNp8duKHY92MjuCi6H4KF64ZEgHx9fzw5k1h eKBNc0LYAdLNLuU3jSqJBQfpwetbQGem3bdI7cWoZmU4bD64S4UukvrOu444nOV7GDRGdQ 193qeGllvEe7xjRHGZ4QR4jSs0sjUB8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=FvBSnRod; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf24.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.209 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696006858; a=rsa-sha256; cv=none; b=jVOlJHIupjP4wdoY/3zdIUod4wC5FTQRxwK8IxnfOyqcAIPo7kTFb0r8pVtkfJfO9ZzVP4 im2ZeM5TzbcyMu/0J7dTsLST+bQCo/V4pcDTtlf58QKZZYJyK1uVIJC70drb1jhuP2Gnik ZI2o82DqdtXwVMfyu30KpjfnZvbOAW4= 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=1696006853; 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=Me9MAVaSpVROGgcWoh0I/C8teSI+rjxEqbPFaHRKJ3g=; b=FvBSnRodYA5Sd4A0oVj58qd5HlqzSeBDURpB/mlvfwRFHRyLlrl7vm/NnDAEcPFhQa48Na e8gJYmZuAXMyu6jwCM3VxzQlsqbiFpwHn8ZPzhLwCaXYZd9pyk16PVxo1NyHSIm3GP10fQ QQpz6jfvroz87aR+oRYbTstIZrxOk0Q= 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 v5 1/2] mm: allow optional initialization of page count and PG_reserved flag Date: Sat, 30 Sep 2023 01:00:25 +0800 Message-Id: <20230929170026.2520216-2-yajun.deng@linux.dev> In-Reply-To: <20230929170026.2520216-1-yajun.deng@linux.dev> References: <20230929170026.2520216-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 405EB18001D X-Stat-Signature: oimicrjzgfirfkhmu318crm1md7q1kut X-Rspam-User: X-HE-Tag: 1696006858-835376 X-HE-Meta: U2FsdGVkX1+ADY4wroa1Vwn5cfwV0AHP6J1tpxmv+0vm/WtR80IzpFjdiOV8IiDUvRyYcF2unxnze6DcbJPnUohY82SIxNx8GnicbWa1DDDfSzcsye7zdC7RfZ5bvFELmddm6axnQ9pLAK9GU31QwnCPpSToW2O5mebSE0d/zE7Tl9yIyVzlW15S75VsEd806+0NxMdYJ/2WbAvj7V/4oIlaSCps9RA+0U2CXt8gtsmNMUTh/1LgT9r7EvGXlUncMPDPXbFlVx2rxW9xl63eOqQDuJg5jTim1CFWh7t1mnuaz/E7qjG+wkY/ZL8KRNJXaoeu/HhfTp02Q5VVymkAr/ZvB8VhB7JZZOtHwa1Hj+RAU5GC5doP+/vATRlJE1PibXS+af0TTDmmzJs8z4tbjdpjZbJrm/n0JCW+MfuJCz7PMoRZNAYLxd2sSqaiyiRDrpVaT8AzJOxsvfgGsSg3I9XtI+S7cAQeYfDaPsJpN+sCvqD7hy488+riZ8P8S4Cc/YP1KuOBeeo5ohsvCyOhvblpkywJfqJG7oFWM5QhstKHZmD6gXmzCQkFXm3KB/EwnaPZMjCA5TB/bAHyGs1hZIQtP0jBLnoNwtrvmYj9KvmK8NJxhlSpWc3UO9Kml8yL1WMRiX4uY8mmFzVc10xiTAmJAf3CJ8BcHJYgRFMhzmpruvAeVv/sup/TJGE6xXqwrpVHQXrmXl0791sZI3NmMkmbM89MFljHtkhucKsArX0m0acfB4XqNUsW2gchgLPiLycY+d44GvjWLfiPfndiAJKAqSmoEvmbjgH4XXey4WY1HGpx5GLPB+nJSSEzJABKto0umNsHFwMLP+vhZcWbiXWjdrTbmBvgNmlnMl+m29L+8g0pU/TcmroejJ31Ty1WMQIsz/WgS6CLVfIyiojnOaLOkdGiJnIScww8AI2ug2P1aJrRG18TdJHXUJ7k07r3hDOiRlYccN5F88xExzC 7UUAmdYx ONqBDjtcukqnvTGf2ibLCb5ySI2fkfL6JYv9coFhgsZhy91vW1RJipa6wlSsaSyCl1I+uMblZtetI43ETtgFc0F7mWvxMv9K7Kx9I9q8u6bjmSevZg9FTbtU3aJO317v+wq2BUuZJoTtHJaVA9xDst/aKPpTwNC/nK3iV9DL4LzPKOwCIBd+Q5XdCEg== 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: __init_single_page() unconditionally resets page count which is unnecessary for reserved pages. To allow skipping page count initialization and marking a page reserved in one go add flags parameter to __init_single_page(). No functional changes. Signed-off-by: Yajun Deng --- v5: change the subject and commit. v4: remove the changes of __init_zone_device_page(). v3: Introduce enum init_page_flags. v2: Introduce INIT_PAGE_COUNT and INIT_PAGE_RESERVED. v1: https://lore.kernel.org/all/20230922070923.355656-1-yajun.deng@linux.dev/ --- mm/hugetlb.c | 2 +- mm/internal.h | 8 +++++++- mm/mm_init.c | 24 +++++++++++++----------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 32dbb4f82470..9c22297d9c57 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3064,7 +3064,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 d7916f1e9e98..536bbaa11be1 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1209,8 +1209,14 @@ struct vma_prepare { struct vm_area_struct *remove2; }; +enum page_init_flags { + 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, + enum page_init_flags 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..0549e7c3d588 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, + enum page_init_flags 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); @@ -967,9 +971,6 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn, unsigned long zone_idx, int nid, struct dev_pagemap *pgmap) { - - __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 +978,8 @@ 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, + INIT_PAGE_COUNT | INIT_PAGE_RESERVED); /* * ZONE_DEVICE pages union ->lru with a ->pgmap back pointer @@ -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, INIT_PAGE_COUNT); nr_pages++; } return (nr_pages); -- 2.25.1