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 B747BCE7B0C for ; Thu, 28 Sep 2023 08:33:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3819B8D0002; Thu, 28 Sep 2023 04:33:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 333C26B020C; Thu, 28 Sep 2023 04:33:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FA6C8D0002; Thu, 28 Sep 2023 04:33:28 -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 0E6EC6B0209 for ; Thu, 28 Sep 2023 04:33:28 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D0CFD120B2E for ; Thu, 28 Sep 2023 08:33:27 +0000 (UTC) X-FDA: 81285342054.21.873F26E Received: from out-202.mta1.migadu.com (out-202.mta1.migadu.com [95.215.58.202]) by imf19.hostedemail.com (Postfix) with ESMTP id DC8F11A0024 for ; Thu, 28 Sep 2023 08:33:25 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WcFZHc8S; spf=pass (imf19.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.202 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=1695890006; 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=a4tohkc2BgTYxo5fWvBiUQcUwwrbq8bCk6m+UOHd8dA=; b=LvLfOMqp5QmmHmw0i1mF3+ndCisJKqkF5NDVnDWKBdSMLDbVSPrlzsnire7CLtq/7d+yan DoPMC6mzzs+m4MPKG+KIvgIby8d8QR2f9hwKlG6pa07T6uEGg+wJrI0LLRn8z46w49lI2s 3mjWJ3jAaLDiQ62OPPtaYF5PNKAGWv0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695890006; a=rsa-sha256; cv=none; b=4hWkPubyYJ0GdzZubO1dsuj6p8BBjz/aeMCSwXGvRq10igB/EM+7vk8vIj8EPlag6Fdmw+ NuTSZloEAnLZ52tDbsgBCHm7ewQE6qH4AHxGqsqsxqnsrdn4tIzEl3lMIjS19Vuuvsbo+q BlzEt8Z2LxhvVQXKkj76hh9ocX+Rsak= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WcFZHc8S; spf=pass (imf19.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.202 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=1695890004; 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=a4tohkc2BgTYxo5fWvBiUQcUwwrbq8bCk6m+UOHd8dA=; b=WcFZHc8SnflLhS42ZmPjCwWYTNF1kxKAw3o6Rm6JsZp3931sTFhbkjItkAaLW6JAtC6OWB eoY4eOUc022OFrfZMhYPQXXBKZvu6q1nj+9ARwHe01oJZNh7gl9Y4508ISuEY+PFkQ6BzU 2esXS4vuR9CxWh0k24fkf7HOf4L1OVo= 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 v4 1/2] mm: pass page count and reserved to __init_single_page Date: Thu, 28 Sep 2023 16:33:01 +0800 Message-Id: <20230928083302.386202-2-yajun.deng@linux.dev> In-Reply-To: <20230928083302.386202-1-yajun.deng@linux.dev> References: <20230928083302.386202-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: DC8F11A0024 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: wzrrdbbbefq7aeo3yqmin1orkhy9kot9 X-HE-Tag: 1695890005-145088 X-HE-Meta: U2FsdGVkX19TTrsDYFgad3c4j1xTnA6khlxUF5w47ml4VNRloXww2ISD8CdjMqQBXF1vz2sHDsFy1G7zdUnAXmbX4YmWVApTCkLlpp0Ahimi3K1Sdr8m532hx5XduMwQ3quWWw+Hd+jfcwKL12t8QYOuczV0b/RlH6QuHekMIF7nh4vkIUZbrEL/3NWFswK6S/TEHQnlq4ZOlZmmhEWlR7ps9+Udl9aCO19C/EMBbU2gcG1cWaH9a7p+SZrF5yK7Yg6SAiUPvXX9Hgs2Ui44iunjpTigWfAvmtABSbf1/yERWKl5nJTaKdqFUoIJDoj58e/WZ/+NIi9ew5SH4kkEcE9/uueETCa7iZFA6n2eOOoexxowCV/3nPMirWri+XSCOLh0Z+KExKmElH+r9ZOU3qsnIe+r2QQkwVWLf5N8wjhSDSwwo7cPc7nCoNGG2sBOnE600NZ08d2NqmppYNLXlVIsplVK80u85QJYVbSNGa5vcpMo72HsRolKuACYXA8zUIErxOXUbNNPYL2DpAd8KtGPR4hKhOa4ZXE4PCJRZ01S2dutNw8o9hJtlIBlTavazN/HU+1emf11U4ODURH9hZS8i5hxp9KjxQagrdi7niA4TVlJHEIcnKKOVy8rpeEpHC/kcH/CjhZuxEX40zBFdNDA2TGheGL/uywVlcW7lz2t/Y/F66gqA75PY/ZISIHY5+a08c3L0YjAmNpIFsbrTZ3tN6qPHD+QYGior0CLye0JDjLmv1yUII7JyQUii46bfFsAuApDFADCRWZ/PPJQT/14QJbiBC6sVhL7YFSRL/6VROXPIcn2GLuCgNkAtccQJetvBykUvspMFQ6edRKDUwOVVtzHgwpFShiM/Zi8LhDai9VD3gVNu0m/+d8twXxcikmG5gQpr3xsAMhqp2TEWZHIv4rBVui7nj5f08W1+0pJ3320+gUlNkOh0OA2vSul/y4ZhzOLrZq8n64mi+s wlVWrBqB 7OUsOY5RHjFBgYrE/bxWYd0RSXKE98X0t8Go1Ul9ZaQpj2O4+zCIqEy9taXCBUnAmar/A4qUQYP8IHJL9pFvlHYWMD4C0XASZ7tISJ0BtelK4K22quPdSz+sfCl3wTACmBZxiqytatIDIaK4JQWwTSQIT07qzjOpPH6nKk/EEdxXDTfV7bqEB3D1xaQ== 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 that page reserved when it is reserved. And some pages need to reset page count, such as compound pages. Introduce enum init_page_flags, the caller will init page count and mark page reserved by passing INIT_PAGE_COUNT and INIT_PAGE_RESERVED. Signed-off-by: Yajun Deng --- v4: move 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 a82dc37669b0..bb9c334a8392 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 d7916f1e9e98..449891ad7fdb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1209,8 +1209,14 @@ struct vma_prepare { struct vm_area_struct *remove2; }; +enum init_page_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 init_page_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..9716c8a7ade9 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 init_page_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