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 A1B00C3ABB9 for ; Mon, 5 May 2025 22:03:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05A326B0095; Mon, 5 May 2025 18:03:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 006656B0098; Mon, 5 May 2025 18:03:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E371F6B0099; Mon, 5 May 2025 18:03:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C674D6B0095 for ; Mon, 5 May 2025 18:03:33 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 69AAE160B62 for ; Mon, 5 May 2025 22:03:35 +0000 (UTC) X-FDA: 83410231590.01.B0F0A28 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf13.hostedemail.com (Postfix) with ESMTP id 6F91920003 for ; Mon, 5 May 2025 22:03:33 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=CQgZ1G9Y; dmarc=none; spf=pass (imf13.hostedemail.com: domain of akpm@linux-foundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746482613; a=rsa-sha256; cv=none; b=QzXADhP5QfHyXV0IxcyV2Mezmin1ze8+CIOqmGvKX7yOP1YhTBZJlRWmgep/iPvIp81qII a3ot7sBwq8D0P5aHljV3njyIS4hYC7FhQ0sod7Kn1cHycN/FSV5lG0NkQ9XJIOsbd8L+c0 ZEeqd/ZgxJ8fPrxMpxneVeLn2VcHO58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746482613; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kZsOE6CiPesiRabwRCLm6jpnjfjQbQr3tmev5PlgLGQ=; b=3+rwOJETyQI+3efG8X2aefdfczBkX0Xt5w+3TAkIzQCQSN/xWK8hcbkIgBM0zvDSKNy/fp qCTW+/dq+igGw84FE5nThWuZ3ErIQkUCIWM5rvgh1SSzw1c/X9AlAMtr3nPCI9OkrR4Nnp Gfv4Ng9x7JtaO2Ooq5g30WTS3nqPcac= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=CQgZ1G9Y; dmarc=none; spf=pass (imf13.hostedemail.com: domain of akpm@linux-foundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 53C7B4A60A; Mon, 5 May 2025 22:03:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73C81C4CEED; Mon, 5 May 2025 22:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1746482611; bh=LiuxTPu0KyN+dFzDqmlY6HziRv4Sm5L8NJ0NSvp2MBA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=CQgZ1G9Y/fWXG0L/lcYaZvELd9ZMFv5hwC7/WgtE3cXGh7BZQTyq9+WGO0RZqbOWZ cJhTbqbbGAMEytO1JLDrKBUm8XpHqEPerJ2L2OzZB2PclyojsfNjzxTixwdVsGe0tU W01GH3041jjPS9NnQca+eklydUZ5MwPj8irE2TLY= Date: Mon, 5 May 2025 15:03:30 -0700 From: Andrew Morton To: nifan.cxl@gmail.com Cc: muchun.song@linux.dev, willy@infradead.org, osalvador@suse.de, mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Fan Ni Subject: Re: [PATCH v4 4/4] mm/hugetlb: Convert use of struct page to folio in __unmap_hugepage_range() Message-Id: <20250505150330.58874d0435095421a30e8c30@linux-foundation.org> In-Reply-To: <20250505182345.506888-6-nifan.cxl@gmail.com> References: <20250505182345.506888-2-nifan.cxl@gmail.com> <20250505182345.506888-6-nifan.cxl@gmail.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6F91920003 X-Stat-Signature: o5g7rbna1i4k7kzjfccbwbt1j54o53nz X-Rspam-User: X-HE-Tag: 1746482613-394055 X-HE-Meta: U2FsdGVkX1/dmHT2LUn8Os+msBGCpIjkITezzXVxmeOXtaYq4ZVdfE/8V6TqAZ29reEhMIR8LfZzoWmf+MdAay4hnmApuuCQ9SHzwZb1CVEGnS0lHmwMgSB8a/hIIkAM8cYx3YqPf6bV6ayGzO/P0OZEzM3vdL501W10KeZ52zcHpni593YKolwaVz1wJtBaCMzZrWdxayR+rNSMzeojF+XN4d/z7wSvMXiL809Rr+EXtM6/uYbVQf1VKKjXvj9o6EoQ8mIxGGpptdbL8i3LZNx+3T8nlfs3dCnLzYzMdKzsIwUhFd8oUUBFEPB8Qmn9AOj2ZM/pWTJNIxoDNywa3Oa+sbu6XI8Ruk0CDZVOozxxdgIPtmG2l0vP/xmliK1OKntID5tjBqCdA2blrxXknwlazs3agLdCr9aHQpVGZ44NG/ujyhJF6bhIE0KAw8FhyyrrJENhR8Lo5xaySvfznstsvgSse/3XTOhvJPtcPPvZ+t9dto237Mw0pNX7Cy7W94QKHYwHxFEYFuBWjzkY5BEFKTO2EAxiftf55WfifeqSBvVhVpl5khrHIKIN7DXd26PvzKLvDFYX7T6gcw25oDRWKU06OAcrYLqg8bvMOBtHgEEh17XyJbmu0uAU5Oq+tZBwYks+sa7otqX66bM/grn93ZSH0uVTgj1KfD5LkddDRRgH9NfZVbZHJ8iiKKJG90Vzjcg5zIOKh1Qw7pTMSFDILDiC4FYeQxtO4UnDLESj+4ePlMqHzaNcMcskJB6CD9wY1dKT2YTmmd2UcenJ3zWq1j7/hR0zOT/q5A66owO+/c7QyyQzq2a0VO/vBKF2KvJJybDiqgY5rvpKXBQtxA/u0rG9Z/pgkiaTssJExkpxLOhsQ/Wmpe6SBHTBcfVi4Z9X8AuN57LVt60fIcNr8kcCBzw/Y2TrHkYlyZa9jyEWmB7+pVzrI+l7YhFgwVruEuyIQpxMhjojDeSKP0a D5dvNV/b yOXfEBTrOz8nq1aUBclLrMxSA9zDGFRk6ewvQJzxhxB9uqcaX8isEUA5RX6vKR2jUyD7g1DgcCzo7jmmKk2QbbWXW7E6pxJ8oAgqG2dtZX2bWsi/zfmK6+2vJkl8qM5AIdY7HZ2AuXdZ9iVwP2Ci86v/1Pzhk14miEfA3bOeAzc9CqgXVUtj45jCt9HYhRcXG6a/ukoO0gvwiVH2kCnYZDZrmCqe56mVPYvhpPli5wVwYJDQdiMZibASIrKMzcIrSSt8eOAeAHO44spoCl/f576tOALTG+qvk/q9kQhz9wLI8wJqF3v74mH1TrCTHjgWw3BdGtBI3SckTxNUb1f7F2FMU1ra5TKf/C0vjCRSs0jb4WfnzN21HVoDgUEtDjojs7ddnJGcn0TVkKxrZy8JA3hvUwQ4uZbAe9cBiIapHw0wT4ibYSeWk+qCkjs/+9Igwe/lPem7cFZwJvfx9yPCJKs19K/YtiQ5e5u92+w8NnPi8I3VY/t2R76xllnBESklwLooXifPHkrOjWdHyenFmMsgJnK7etp7G7zmkc7SXqVc2DdERDr94shsX9QYaRUs2Nom0kykZlME/WsA= 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: List-Subscribe: List-Unsubscribe: On Mon, 5 May 2025 11:22:44 -0700 nifan.cxl@gmail.com wrote: > From: Fan Ni > > In __unmap_hugepage_range(), the "page" pointer always points to the > first page of a huge page, which guarantees there is a folio associating > with it. Convert the "page" pointer to use folio. > > ... > > * Restore the reservation for anonymous page, otherwise the > @@ -5950,8 +5951,8 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > * reservation bit. > */ > if (!h->surplus_huge_pages && __vma_private_lock(vma) && > - folio_test_anon(page_folio(page))) { > - folio_set_hugetlb_restore_reserve(page_folio(page)); > + folio_test_anon(folio)) { > + folio_set_hugetlb_restore_reserve(folio); > /* Reservation to be adjusted after the spin lock */ > adjust_reservation = true; > } > @@ -5975,16 +5976,17 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, > * count will not be incremented by free_huge_folio. > * Act as if we consumed the reservation. > */ I did not enjoy reading the above comment, so I did this to it. The comment would be better if it described why we "Act as if we consumed the reservation.". "why, not what". From: Andrew Morton Subject: mm/hugetlb.c: __unmap_hugepage_range(): comment cleanup Date: Mon May 5 02:54:25 PM PDT 2025 Wrap to 80 cols, fix a typo, use regular layout, parenthesize function identifiers, fix grammar and add braces. Cc: David Hildenbrand Cc: Fan Ni Cc: Matthew Wilcox (Oracle) Cc: Muchun Song Cc: Oscar Salvador Cc: Sidhartha Kumar Cc: "Vishal Moola (Oracle)" Signed-off-by: Andrew Morton --- mm/hugetlb.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) --- a/mm/hugetlb.c~mm-hugetlbc-__unmap_hugepage_range-comment-cleanup +++ a/mm/hugetlb.c @@ -5969,16 +5969,19 @@ void __unmap_hugepage_range(struct mmu_g if (adjust_reservation) { int rc = vma_needs_reservation(h, vma, address); - if (rc < 0) - /* Pressumably allocate_file_region_entries failed - * to allocate a file_region struct. Clear - * hugetlb_restore_reserve so that global reserve - * count will not be incremented by free_huge_folio. - * Act as if we consumed the reservation. + if (rc < 0) { + /* + * Presumably allocate_file_region_entries() + * failed to allocate a file_region struct. + * Clear hugetlb_restore_reserve so that the + * global reserve count will not be incremented + * by free_huge_folio(). Act as if we consumed + * the reservation. */ folio_clear_hugetlb_restore_reserve(folio); - else if (rc) + } else if (rc) { vma_add_reservation(h, vma, address); + } } tlb_remove_page_size(tlb, folio_page(folio, 0), _