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 2516CC3ABAA for ; Mon, 5 May 2025 18:25:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77BB06B0096; Mon, 5 May 2025 14:25:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7021E6B0098; Mon, 5 May 2025 14:25:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E2DD6B0099; Mon, 5 May 2025 14:25:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 27D0F6B0096 for ; Mon, 5 May 2025 14:25:28 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 97F6059B6E for ; Mon, 5 May 2025 18:25:28 +0000 (UTC) X-FDA: 83409681936.02.D7DDF0B Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by imf30.hostedemail.com (Postfix) with ESMTP id B3C288000D for ; Mon, 5 May 2025 18:25:26 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TWbjY2Tr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746469526; a=rsa-sha256; cv=none; b=cTFEAbhdOpKLIqw8RADL6tZ9ic1c4BocEGp2Vm/wf7G8EFAjX6OUg7OjQTGeGS6aZy0uYs gMfqo1BSgODRjuM6CVDtJ3f/cqbcgJbObryBHhIsRXtuJQCCCJMAH7Kph186DiGMNRvKI+ JbWxxehs1b4GzKfFfnY+DdnwIdx06E0= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=TWbjY2Tr; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.219.180 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746469526; 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=XuThg12fH4g5ZORp98F9C2viVi9rSeBkPi/CF3lFj4A=; b=q8adtQFVsaBzTZn22LFF9PGTs3IySNCNvg1LSsAjJnS/Acp7g/YH6dPiZcElN8ytcJW+o+ fKrWADcZuIRi3DrcR96IdjBUz7eeLBMmdzB9U00nSbkTPaz7SeS7zH4PC+xOGxK93hSFWh 1Wsp+AWknoWM/+uABucqcSbK07zS/cg= Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-e75608f582aso3074757276.3 for ; Mon, 05 May 2025 11:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746469526; x=1747074326; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XuThg12fH4g5ZORp98F9C2viVi9rSeBkPi/CF3lFj4A=; b=TWbjY2TryQaZCtr5NKPsYLBuM2sSILNKcUl2Mzk+nHESBvNpNJa7Eg3GL3zTra2CEf zkNly4wYaKtyrz4Wm5Kqgh2watU/XeU6ycwGFf6ntaGKuWg2KLR3sS83cavO3MrmyKjF QbNvBBgr3OEtw2EeFbuUbFTIhOWRto388TUZklaMYoLhdDrucZ1vJREyziM4zfzLpjam LVm73gCrhNxrAQkwoLl+2cUrV3cQDSIbjCPD3UGTe7bBY3blpyFZulZtpe12ErBQgX4H BvMtphRW8GSaH6Ev7nSRdgZnjMuqbc2aNMJC/vw45jq0Pj6PHaSpiJqTrIk8CfHgzVbR gHuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746469526; x=1747074326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XuThg12fH4g5ZORp98F9C2viVi9rSeBkPi/CF3lFj4A=; b=QAV5bGAtFOCa1WzGVtUDq+4ZBnAAfGgpHA6K/+tTWz0Q6fc3+xclvRky4dUalkoEfQ CtSjgDUhhP9auq2XO8t4RZSj0Lzhd9oPChKfLqWTiZ1no6onVSwSWPsCldsDZDAu44Zx ZlS+Dh03uea9JRACRqfIM0XtMEMANVZAfhcA9L0utBlUuN4nd8UOW6A6y1KCzVjtBeHg XgwBcP6K4Nah2fN1RkSpvwluy0dt16Ww1sPMsCBAG1aiMqakCcLhsfTh2WvbzH/+rFhq FxMQDMgkFG+ts6xZ+1vLgW4lhFDbdQT7yoMiOIgq9UcotSjx5D+ld3HJJX+b4RN6QGlD qlJw== X-Forwarded-Encrypted: i=1; AJvYcCWSKayIiC5GlUFvpoNk6I4Ncr0G5a7n5bxGwLxbOEvLX4ngAp202eeSUhbWnSIDGf5ImbbmR4C1uA==@kvack.org X-Gm-Message-State: AOJu0YzReB3rzADFyGP1tbV13uMAgB0IWXxtRD+muX8U5vu4U9pT2vFg 61eAgWpxnpyl5OCaeJNF6LTGPpzds+8EZjxIVSEmSDsPzfM2rgLDPjjAtw== X-Gm-Gg: ASbGnctzB2dFfEbeKlVqTblEGBwXQPmtI6iTtV0UxV5Blsg3pai9Biq44cn2Q0c576k 60v73o+04n5PY6dRiG+v5Keq9a5Nygf/QPvYoqWSszm7uOjaELUmDXbNgC/95es+tsMLdqRT67z xDE0rzKhssuMwIQQtsPABJEQ18VVC7rCdTDhbJbTtlVogAKQkSPrWUxYL+py9cBYDmYnBi+eXFP KMx/0w1YFGotTNaZWMcQCb5+1BLujFNapOuVhrhC6yBH0nFMf0n3Cg85cHIHSxaUK/Mv7II7mj4 GJESbEP/AOM8flZUbdYNHS1BBIdR1l4xWU2D1x18xgaZ82mjZ9yWCJeyx8fasQ== X-Google-Smtp-Source: AGHT+IHWYXQ31FfmXio3NIqUd2zrA9/4L6iOyWFYTcB4iuWcOjNrqaYf3lxVr14Id2sBiuOIFJkjlA== X-Received: by 2002:a05:6902:729:b0:e72:ecd8:6d44 with SMTP id 3f1490d57ef6-e757d2d97c6mr10480471276.20.1746469525631; Mon, 05 May 2025 11:25:25 -0700 (PDT) Received: from localhost.localdomain ([50.205.20.42]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e755e7a897asm2113429276.38.2025.05.05.11.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:25:25 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org, osalvador@suse.de Cc: mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, nifan.cxl@gmail.com, Fan Ni Subject: [PATCH v4 4/4] mm/hugetlb: Convert use of struct page to folio in __unmap_hugepage_range() Date: Mon, 5 May 2025 11:22:44 -0700 Message-ID: <20250505182345.506888-6-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505182345.506888-2-nifan.cxl@gmail.com> References: <20250505182345.506888-2-nifan.cxl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: B3C288000D X-Stat-Signature: tjc7prx7cmk4tespymu8dfgfz3n4t573 X-HE-Tag: 1746469526-434242 X-HE-Meta: U2FsdGVkX1+E1C9l9GHc7h1yd9j8DeoxgHus5vpD03x+etVI5jAS38Qkl64mhttMkTWTtFv+eurxjXzKphPRiWVt6XLvE899A4SchH70tNSYqXw9kTeHPRp7MiXe6en7iV769h5yejaflOyCjg1lS5x0TTpuDmJjy23h15cAhd+RSHy0pC/MhKIsbUWo8cvjDFcJj5snLgTWp15+0SeNWgVwEnEKikdpXGxpu1fQ3x9IuB646r44T9xIpseMigslj5XR0LwO5fXNfh27CesJ+Ao9h65mrNJfG5EdxznzaW25PMEsbjaDrNcGpO/Qf6rDb2XZ80ppcY0oIreV+C5LwEwIh7javvhv2iRq3Cyp187XGIC5eaAj/YmVzhqgIqnlfGqyKnfYDjWuBF/jRYMcQE4DzjDc+OAizJyl3dQKBwBpJuTGKUUWcBmtlllHWtJPtBNJnw600jF6yJtqJNHjqzTuCWJtDzrkBIhoMmvz6H85B2SmTs7q51P/9X1j4bJggd5cFN37QF9yjwid/dxzoOCAxCOhKEDjCkJx+7snFtp0NLCZhS1+CkukL/OecMzmlG1/nx3fL6zb8PbbSle+OQzqKCC/24d04JWOT6k1MXq/fzsOkm0evglGXZDtKqw/83EdOHr8t2wk8DDh7xQYaX6myqzy7kcehtBi56qAvPgrNcTBxOcQV7NWmpTOpXNpDEHGDwJvYcreqjybsFoRaF/7CUVzAsrBAnAVmg5r+Fh4Ly8SadBaz4m+1aEJYcex8Aj69UEeWhi6btBZKpyUkrswyLvdBOPFmmTQzcKXHLv27uGQlLWo1VJ9QlT6Yl9HXUX+bi07m91aYWzs5sWF2PLKZy/X4SBzcoybkRG5KKWtLjG6cS/x0Vr14Bkyq0j7Z1HNxRdgBl5yNgfsRx2etg6HdOAw4HeHPYbKqEWFOSKjzVlQFYsW03kuDCImr2/yvwGGIFi9kSpudQD8y0e cjvdYJlB DblN69SHI36KYHy7vq74sdNHRr1nLaxErOu+/P/lzNX6ZVzZvvBG1Lx5b2oJSrv3Yu510wsT+SdtK/oIw2jU4tL/6tkA3qL0qnjHB7k93DSgW8sPc7OTqT+dSQ/IH7K9fKjjalJr4SqKtBFUqBmjkj31n6Jrm4qFIE4BKtBtdo3G3l9FCYMQr1FwAcJq+Z9kxkvFUvWTQngmaEIdQVyTeJNyuhPL3rKBD1ZxZ+uUMQYIAWnFKymyzh68bu9o8185Ls/ZxHLMaGkdtk6amoRUGmskglXV25XCYtm+oFwe4uKnhhn0d878jCcgFZY9ZN5ta0e4qmRhMVK/t94BFkFhtu9ewyneTFnNfY99PA3sjxVhY6s1qmvGnKyDrgtATySS+/cFhfjWl0RU5KQggOydHhpaxiIuMFMigDnOPuiBDpvqTY+5xRSydcjo5C7wwmiDhW+GnFzgD5QPoad0xpnV6PqIOC0Psq688pklxyAQwZbu7DTHtJ5CPPh5gFunaWpH8PYgO3On6Fr8Vr3+4dwv8naH/goKokreG0cvvcmlTSjJQz+o= 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: 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. Signed-off-by: Fan Ni Reviewed-by: Oscar Salvador Acked-by: David Hildenbrand --- mm/hugetlb.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 443b75e116cf..d53caf96a4b2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5843,11 +5843,11 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, struct folio *folio, zap_flags_t zap_flags) { struct mm_struct *mm = vma->vm_mm; + const bool folio_provided = !!folio; unsigned long address; pte_t *ptep; pte_t pte; spinlock_t *ptl; - struct page *page; struct hstate *h = hstate_vma(vma); unsigned long sz = huge_page_size(h); bool adjust_reservation = false; @@ -5911,14 +5911,13 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, continue; } - page = pte_page(pte); /* * If a folio is supplied, it is because a specific * folio is being unmapped, not a range. Ensure the folio we * are about to unmap is the actual folio of interest. */ - if (folio) { - if (page_folio(page) != folio) { + if (folio_provided) { + if (folio != page_folio(pte_page(pte))) { spin_unlock(ptl); continue; } @@ -5928,12 +5927,14 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, * looking like data was lost */ set_vma_resv_flags(vma, HPAGE_RESV_UNMAPPED); + } else { + folio = page_folio(pte_page(pte)); } pte = huge_ptep_get_and_clear(mm, address, ptep, sz); tlb_remove_huge_tlb_entry(h, tlb, ptep, address); if (huge_pte_dirty(pte)) - set_page_dirty(page); + folio_mark_dirty(folio); /* Leave a uffd-wp pte marker if needed */ if (huge_pte_uffd_wp(pte) && !(zap_flags & ZAP_FLAG_DROP_MARKER)) @@ -5941,7 +5942,7 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, make_pte_marker(PTE_MARKER_UFFD_WP), sz); hugetlb_count_sub(pages_per_huge_page(h), mm); - hugetlb_remove_rmap(page_folio(page)); + hugetlb_remove_rmap(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. */ - folio_clear_hugetlb_restore_reserve(page_folio(page)); + folio_clear_hugetlb_restore_reserve(folio); else if (rc) vma_add_reservation(h, vma, address); } - tlb_remove_page_size(tlb, page, huge_page_size(h)); + tlb_remove_page_size(tlb, folio_page(folio, 0), + folio_size(folio)); /* * If we were instructed to unmap a specific folio, we're done. */ - if (folio) + if (folio_provided) break; } tlb_end_vma(tlb, vma); -- 2.47.2