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 8B6B2E743F4 for ; Fri, 29 Sep 2023 08:20:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 083896B025B; Fri, 29 Sep 2023 04:20:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 00D276B025C; Fri, 29 Sep 2023 04:20:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF0116B025E; Fri, 29 Sep 2023 04:20:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CB2146B025B for ; Fri, 29 Sep 2023 04:20:42 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 98E5AA101F for ; Fri, 29 Sep 2023 08:20:42 +0000 (UTC) X-FDA: 81288938724.13.196935A Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf06.hostedemail.com (Postfix) with ESMTP id 2FA5F180013 for ; Fri, 29 Sep 2023 08:20:38 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=THhCG9Av; spf=pass (imf06.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695975639; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=owR5oL/ivPA3/RPm2t+LCI1DwtlqO7G1PVKEflp2Hds=; b=NXqnLzyRXxbtPDh9P5cEMZQdnGWqTPy9ePYHUnVa6dv8wNqEZkFza3CECVVhj4mYKVPokR Z9CO019R5pJsR+eAt6oAfTmEYVfTC8r7HTSj0nscXkn6RtvmRNT6l0l3z6Gcub3PokquuW JQ2wyzH7r5ctyGLNOVA8J4Od9aimGKw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695975639; a=rsa-sha256; cv=none; b=WVqUjlG23yhz/siIcM9EACRlEK8xMWVUd1Z/yVjisbqL2xgJl5XsGU9E7tqDDPa9FMTquN dH30MRkPAauvgtaOiZ8KygZCVBElbY7Oe9prrLIjG6N3p8Xvq9oifpADo3GXxdep0wuzi3 eezOGwwvsLhN2xGjQN6PD9+ujCHSBWA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=THhCG9Av; spf=pass (imf06.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 4D6CACE233A; Fri, 29 Sep 2023 08:20:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA3CAC433C8; Fri, 29 Sep 2023 08:20:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695975634; bh=STdWp6XZyS/VxSX9LqKQLcDyzvUbrM42UbPwYACPsvk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=THhCG9AvZ5uuDE5QlTcRq9tpKCLVMCNz6kcmHc0xFm5d50/xFaYwBDrFyvnYTGVo8 Mk6Vrqwd9fvrur+uGNe6YebrbBQjDhszhiz7DUDa3Y5amMOs/KyE62JL1De03fl4BO kUefOLPYo/escFa7Q26dTEQZ4tLP+9dti/crevfqGjwvJlDVzs6Q6ROfOobGMKQys6 LU4blgUt6qdPEM1VkONJMApgfxQnlNlf1C7PH6PLY1VDhl5nXspb0/zs63oNjqkxL1 zvOI3CtKbDR/pDhFpJkZdB9yriY7j2h5SHN0u5TAY7b35RUAscPbLJQbv7cZxYwrFE jwWqhdrcPF65w== Date: Fri, 29 Sep 2023 11:19:38 +0300 From: Mike Rapoport To: Yajun Deng Cc: akpm@linux-foundation.org, mike.kravetz@oracle.com, muchun.song@linux.dev, willy@infradead.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/2] mm: pass page count and reserved to __init_single_page Message-ID: <20230929081938.GT3303@kernel.org> References: <20230928083302.386202-1-yajun.deng@linux.dev> <20230928083302.386202-2-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230928083302.386202-2-yajun.deng@linux.dev> X-Rspamd-Queue-Id: 2FA5F180013 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 44885hpgfoioyhicbaf54zr9ph3bsqtw X-HE-Tag: 1695975638-932226 X-HE-Meta: U2FsdGVkX18HrzGQpQBKk1fr5QDhmUecbd78SE7+diJEWhjKRl4Mv5iH0RDzuWI3MI3RJTFHOzatDsiZHSVYg6QMA+7GbyDhF0xPMysD0m1L16eT9d2yjGLz6pn0kWsugqymU1cmw0d4vhnAVw3ny1k8E5gMg/wVRW2HR8z9kv45BZVgEj2GoiIkpL13VTfwKzHKmto8fOONYhsluLLDmz/+29U5uJGmpTsKVGGNRW0XDuASE182dpUXjbWXFzB/cy7IF+PxXcHBZrg5sjITsj0lkGEi2mg6Qlt51guUkVuuOyjfVbkhIRvTewRAAD2Nxz/0N0G+c1/GaH0Ryf2SgrZDySSXH2y2jieOk4DLkEEyhcMwjX/Nh9JeogOJuHHtiLyW//pGoLL4fy8qS4EAymBtn5rd4q5KhS9BV7ftUdWmuVIqd1enMt/tVMtjIYvJkiOHPIcWjXdTlLgDGklKt/GHnAzOJIAc0IwjanASGtCDf1ae6A7VijW4fWvzIYn6OMX1lwovZ1E8+7ANAta5eoeHDsTfbIQE1Bv8YBW3kNMPZZjP6dgWTLqc2PjsBLMP1ZDdYdYSdo6+yv+b9KKaF+xoFkOiXIdFP+mst4ORtATAfuzdJjz4fgDk9xcVshp5LJ7URIMqtIiYGydsb2uXOhLG63CtG98boyf0WPizdgf7J8dY7K0tMOlGAVUYtdftSE2uLOLbdU9tkjRI5vRkYJ0u6/H1rORVfQKy83F+GdlmcXUcSMut/GcY/ohR4MSfeJSVDVIzy8fGDiXl9Bu1vVasTSxx5SQoYss0rTx7XguZckggj+ZKDPAAFck0CcAUxvv6REcZWGdBS5nS+DnkLshZHIJUlYxddBPm8QxN6/Vlu5w7OFH+RedNb/zGYWdtTnZulwIMAaOHPm6igyrXtutKbn8yQjjf8AvRlfu+6Px6vN4swh4J7CP+/XcKTLT8prJPw1X66rPuolKETVO 5XTtjIH0 CPcWLr6jNfrmH0K1mgQsWm8Xl00Ros0+I1CnmkJoxEFBk/4HksaS49xENuN189vSyB3sVXB3RFCi7WH8AzbRymPoFqt4UgS6ATVNm4STqkIRcmznpxITVo9ZwREg+DJyy5z6PIUWGgSIh3Pck2uhv8I7Y7bwinFdLf3ifhgsaPVtYUqH9vJOj7KpiHan51nhynoNO3mNh2XmoCC045w4LGMDwDJC90piC4sl5dwE6dLUlEQXhrL/VYzRndSDVGScM80a+nXuEPfhoE8IOHoMT+NBKe23E8LGWkriT1p1kCkziMq0= 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: On Thu, Sep 28, 2023 at 04:33:01PM +0800, Yajun Deng wrote: > Subject: mm: pass page count and reserved to __init_single_page We add pass flags that tell __init_single_page() how to initialize page count and PG_Reserved, I think a better subject would be: mm: allow optional initialization of page count and PG_reserved flag > 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. This does not really describe why the change is needed. How about __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 > --- > 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 { enum page_init_flags please > + 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); There is __SetPageReserved call a few lines below, it can be folded here. > } > #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 > -- Sincerely yours, Mike.