From patchwork Wed Feb 26 16:31:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13992787 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 CE1FCC021B8 for ; Wed, 26 Feb 2025 16:31:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6174F28000F; Wed, 26 Feb 2025 11:31:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C72D28000D; Wed, 26 Feb 2025 11:31:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B53F28000F; Wed, 26 Feb 2025 11:31:40 -0500 (EST) 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 2FE2028000D for ; Wed, 26 Feb 2025 11:31:40 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DB6571CA09F for ; Wed, 26 Feb 2025 16:31:39 +0000 (UTC) X-FDA: 83162636718.04.78CEDD9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 1433E40021 for ; Wed, 26 Feb 2025 16:31:37 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Gh0WUXL5; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740587498; 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:references:dkim-signature; bh=GHu2m+JfiqcAmNmA8Ie4OoYRKmm4VU7nL7W5QKTUZtc=; b=MXACeSLV/KNJ4I7cn9LeXocRxtGFRaWBlQQqkXTbh1cFaYuQ9GNcRjpn9tFnMRSBb25qlo k4KQLKwBiTVJueyFTq/94DbsYXKWNpIsB0KnNkqSIS+p/lhAXaGYewk5uhv8oZfeOIHojp NbA3MSSzxHlUcE7Ug9m1IlOYKPJ5plA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Gh0WUXL5; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740587498; a=rsa-sha256; cv=none; b=K8cxo6gGi6amd+XF/4UuTjtn1UP0lIFgTeNb0c4aHR7c1w+9em4AejK8tQRlNmA3extKbZ dQ5pHHiQEmnIrr+QyiYgnnSvvTainoF8aC/xL3dVtDb5NL3Jc7CA0BGowCt8/3zOeGgoe3 hw5LVrrRK2pOY9EFT1gLXfHQH3VBTbA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=GHu2m+JfiqcAmNmA8Ie4OoYRKmm4VU7nL7W5QKTUZtc=; b=Gh0WUXL5dgCvDj7jhmuPPrPuKy NE8ExbslnU44qy7bPL08yaaI3Z42/B87vbJwB8zvyMM0TTNJu6sf6JPWdS32RUxtd2CxlajlbdShu 5xHHFQJSreTBTfq+Bzcp1de2kFGtLLzLMGsvBcV9+f2HWl8sRXZX7Sef7hnFzlgO928dpjxADnDO8 /XEH8auq1dSk5DzmWs5E0eV0szV1xbVLrld/kNR+z5aSXWEooWG8Z4Sw/XMrRgZ6j4OyD1egnXB0x tkeBBB7JnIH6T86q+N9PAFvQWDkWkHm6nZahGzS7Jd04CVT0Yv611q7JCKcRPOmy8UueHeyLoA9QN BaQkBK7A==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tnKJs-0000000FvUL-1Tzc; Wed, 26 Feb 2025 16:31:36 +0000 From: "Matthew Wilcox (Oracle)" To: Muchun Song Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 1/2] hugetlb: Convert hugetlb_vma_maps_page() to hugetlb_vma_maps_pfn() Date: Wed, 26 Feb 2025 16:31:29 +0000 Message-ID: <20250226163131.3795869-1-willy@infradead.org> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 1433E40021 X-Stat-Signature: hm3rbpzbscwfixn5zitabm8iw48eymmp X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740587497-235690 X-HE-Meta: U2FsdGVkX19pEZPRDPvL33WrVavLwijv2HA9bAC9K8olHYSCLsXdatexKrKCCPDxeQeMGWxNh1uX5qz3cPdtRRDHk8iriO4Zz/NAsXxUnmR8Udjj9FEyOg8R9ODhpyRW8I6Br8xieNTzQtEM8tnRDjTpWOgNBTVbWe5FAPW8XDPsEKT8O2IdDDweI00koNck92LAAEnkmLRy8MZDxYG9anW612oAzkn8trG2Q03z2FNUw+VJkk0fdHYye3k/3vkCi3998mIqSWLHFGO5u0A/6RJFvpfZgxSMrpynhMxUDyBFP/8oUbb+F4AuHgF41dxMR/pv0441IlfNwS+QPppo2braogRHClqZJlDkv0pC77yH91+jDVlVwrHVL8Z2OKb74g/DqDAV3lhTLmSBpJU8fj2CqaiZd5X0/hzQVFFlryg18SUR1CnnjjifKBDHNfwP2gza3URh5gt87HJEAY7VxVzqOr+86GrW9WmPzDH+nq0/VEO56re+fjM+moSHCbFeNAv/EJbxA6jwA44bgmF1yQTSrbhmh0QP+F4LOiLBiwNh5nM4uX4R1Es/gI7qu0IcTtDSjDnRVjI+E8wahVJ0Q4FYjAQ+e0ZdUqcvGiwKmFLLydKtqsVaP+cpN5N6ZeL5f1u89/gyJoXBEpl5UzSF/uddl/TlhKkh9IqCkAXLyNFB4vm8wnQv994zXzdqCGy+kadnhjI9px515ZAxZ7ecgO4Pb/m5v332GFjnwQTyghNPxZaGve3bI6A1Y3jXEDPCPotll9+pqJg8NcUJxzaz3xdW61eEaw2ifvWIvTjKZzbZsrcfFairphI05OpVN2lEDPMfnDLWNV8ziF6jbuS1YhCD1BBOLtJcW1JWHmrYcUSQv+mdmR5MsxBDWdBrrjgF3UxhK0/Bv2+RKn0bWB8KSarwtBiTFu+qbNtUrHLH+2MkwffHdoob+1LFlafAkISTo0KNjiM7XrsAYAdhEM0 0UOtw4zw zpku/QcK8y0RK1V1btxLeEJW7O5Ocso3zvXQ/fPZC5As/XzlZK0X7smqFLCJOKvMsFgdLtdLIlEcv7NFOu1FyYTAL/HzjY4tRzGbDG1PPo4bfCFm3t9CFPMGxfFIGclunKWUuuKT5XeZLjiNhyvv42BHZW2sTdDV+Sc8zKlN0J1LfOM3UCEKFmrGGPKtjgUSTBX6AaNEVfPIgSE8m7t/ZmEkyp+GTStP3F69avSdZ9Ll6P/I3L5nLgRii9ou2ciZxgVqWqE8KXAUbnTfvGAY5OQVxKhXha0AkA7o7 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: pte_page() is more expensive than pte_pfn() (often it's defined as pfn_to_page(pte_pfn())), so it makes sense to do the conversion to pfn once (by calling folio_pfn()) rather than convert the pfn to a page each time. While this is a very small advantage, the main motivation is removing a reference to folio->page. Signed-off-by: Matthew Wilcox (Oracle) --- fs/hugetlbfs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 0fc179a59830..a427d41fbca0 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -338,8 +338,8 @@ static void hugetlb_delete_from_page_cache(struct folio *folio) * mutex for the page in the mapping. So, we can not race with page being * faulted into the vma. */ -static bool hugetlb_vma_maps_page(struct vm_area_struct *vma, - unsigned long addr, struct page *page) +static bool hugetlb_vma_maps_pfn(struct vm_area_struct *vma, + unsigned long addr, unsigned long pfn) { pte_t *ptep, pte; @@ -351,7 +351,7 @@ static bool hugetlb_vma_maps_page(struct vm_area_struct *vma, if (huge_pte_none(pte) || !pte_present(pte)) return false; - if (pte_page(pte) == page) + if (pte_pfn(pte) == pfn) return true; return false; @@ -396,7 +396,7 @@ static void hugetlb_unmap_file_folio(struct hstate *h, { struct rb_root_cached *root = &mapping->i_mmap; struct hugetlb_vma_lock *vma_lock; - struct page *page = &folio->page; + unsigned long pfn = folio_pfn(folio); struct vm_area_struct *vma; unsigned long v_start; unsigned long v_end; @@ -412,7 +412,7 @@ static void hugetlb_unmap_file_folio(struct hstate *h, v_start = vma_offset_start(vma, start); v_end = vma_offset_end(vma, end); - if (!hugetlb_vma_maps_page(vma, v_start, page)) + if (!hugetlb_vma_maps_pfn(vma, v_start, pfn)) continue; if (!hugetlb_vma_trylock_write(vma)) { @@ -462,7 +462,7 @@ static void hugetlb_unmap_file_folio(struct hstate *h, */ v_start = vma_offset_start(vma, start); v_end = vma_offset_end(vma, end); - if (hugetlb_vma_maps_page(vma, v_start, page)) + if (hugetlb_vma_maps_pfn(vma, v_start, pfn)) unmap_hugepage_range(vma, v_start, v_end, NULL, ZAP_FLAG_DROP_MARKER); From patchwork Wed Feb 26 16:31:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13992788 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 5A442C19F2E for ; Wed, 26 Feb 2025 16:31:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2F87280010; Wed, 26 Feb 2025 11:31:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D90F328000D; Wed, 26 Feb 2025 11:31:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C57F0280010; Wed, 26 Feb 2025 11:31:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A6B9F28000D for ; Wed, 26 Feb 2025 11:31:41 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 33E8B81C45 for ; Wed, 26 Feb 2025 16:31:41 +0000 (UTC) X-FDA: 83162636802.20.7F75800 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id 631F4C002D for ; Wed, 26 Feb 2025 16:31:38 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nC0r5sUV; dmarc=none; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740587498; a=rsa-sha256; cv=none; b=ElBBjDi2lRDEhXXMXN+umeQxw/M1KPu64OPQxsN0JOSxpPF7P04+W4N7cDp9MmPG4LamQd kMkLYUg3z1sLhTsY46Cogx9oB+BwuwvJlJDOVdeVULSPwBj5TFbhxVyxVlYiC3+lo4XfY1 jr9YdEfrJ0/XoJvejich4hvt0lhMYdA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nC0r5sUV; dmarc=none; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740587498; 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=eSnJIqrmDBfiUZ2lTDPQQviv4aUqu7JK0ZIDBmEMPxM=; b=zyNcIr59FxHfD7Ud6wjZZF/uelKJ5JJTNLZ8togGhXeT00ury3noo6M2ZlRaEcxEqIlpBL I70d3Esbsxd4FlU5k1TLxulqcn2+aK/cfncbZbSKqnjtowXDlpx0WTQAI2Qx3R74PqpEdv SRpluosqbVHlV04tsygWHRPaQ2isHPg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=eSnJIqrmDBfiUZ2lTDPQQviv4aUqu7JK0ZIDBmEMPxM=; b=nC0r5sUVzIRiJpnswWiNK0G9qD gbWinvFn76fPzPyO2AYFe6P2bPGEraB5Lry8vpnkhAIDfgizNJeGHHC/wA7vEZl+VJuj9q053YRJj Q7/Rs/mu624JNLNmlwLnlojNX7FMRqbtfBzyr8HCvguJVx2n9L0HQqn3L/msA8uKXUVFHBLn5DUl1 OkbRFCaJQhdiOxVgvVHCF3kkgXwFET9MO0htFhIkqeGL9yaeSX9F2YFI7Zx8AU5kphQ5b92Itsg9q kW6HVRv7UBcLOh92smX7vFc+LDLif69ynF8rlT4i2IWeVXoVa5afpK30AYzevIdvTJDZk//ZZrHat ZFLKI/FQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tnKJt-0000000FvUR-03iA; Wed, 26 Feb 2025 16:31:37 +0000 From: "Matthew Wilcox (Oracle)" To: Muchun Song Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 2/2] hugetlb: Convert adjust_range_hwpoison() to take a folio Date: Wed, 26 Feb 2025 16:31:30 +0000 Message-ID: <20250226163131.3795869-2-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226163131.3795869-1-willy@infradead.org> References: <20250226163131.3795869-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 631F4C002D X-Rspamd-Server: rspam12 X-Stat-Signature: y5huqcsojrkrb6c1u96uzpcpwnj7t8pk X-HE-Tag: 1740587498-419655 X-HE-Meta: U2FsdGVkX1/XAvitGiK3Zk9NvJ67GEIwLE37rt9MbtqtYNN3fmRrEH2oCqUD2JJe2KyC+MHpKQTpV0opdUT/+gCPJ9BytCdCot6r7EGXO9sN1/CW+WVwMkkWvSoWN9OtudcGpKSHZDE587bqgCGZMKuU/6jvYZQysM9WwJh3cF+CaY2orucOTKptsGmGVbT+pQSyYPppoUbYx3eWtZV64mh4OH9kNvGzt1kq9M8MKBYIaPJ8VUi8Qv41qblh+mTYu0CEBg/IlgkTMxltbEjYhe82RTDncNxxWaP7/PLIgM7kFt62vquK8crtbtZds3T/winLnEVU883Ac7FqabcO751Q/Vz04M9h0MYQSKAPVFH+JiYDCzXdlvhhMpJ7CMM7Ec57EVZ9puVJoCXSykt23wVaiPuVY2OX7hrHe3NHw56F8XvFDk4+VY0C/tG6DtOwD5DasVuAAVJtBCF87KdVKeeQyliDMVZxjHLjgGohx8YvK++JLEX9yalK9LhSUcND1EC37ZwhBnNEwqGRW4CrVESW1AL8dx+9RdFrrM1m/DlJwBfYc43P9BVs6aFtFeOw7X1L/Wh9xgiBAElmbMjRRvFWqlct0l1fTP07iRuQmP+T6YHK6FOo8q/EDtxpihfyODRq0ADCXCqnwPQvQpxrkkUud0yzWdwDvhOiK7eykv012MubR2ovmGLWFRf8dIfE/9C/xoyqK77xSZEXwr1pr1gc4xpn6HdsUIBvuDWHDHXRdSZNSoX3yv/Hwr1hAXbyJuolp2KB5oF3Y/tT+bCXmxvJwYPhfnyByBJ87JTjkxDVOdugRpfC2WKcIEmmF4C/XVjU+HKNom/5Sz5LT9NVsoJJyucVQa/MKP7D9wvpxEJo1zUB4YFZDD84hegt5DHFVxZ7Xb8GBLRW2SMzR7Ics6OgIPpBtnGXAt7AYv+xKorz8hbw0hB4oLQkilhEgiFYpq/ik0OWjgqWC6FSTKM dP8118/l SjCuuB11XjANUsAwCfqeZPNMgxg3bkypPdYm5wAq1FnVHhumQdBLsGOnP8XPouKnwEe4nhCor4zlNNJ794dv3JVTNzCvlyCEZFkMnot1q5eZbQfyb6SBjMgQ0BL5FZf4fg8Y+hSTXdHjXBfyu3xvIjNll2AlJ+X4hk4lOC9pQf+sbv8kKaPnqh22azzCg4Fun5g8TfQCX190xKDDNpxDLDncLRwVzrrwKHFS3TZns/SVy4ldoa4B2Pk0t7pZ1cpWqL8aNplVuMxClMg8+ddofRDZXBfFsaNSCBc39 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: Remove a use of folio->page by passing the folio into adjust_range_hwpoison(). We need to convert to a page eventually, but that can happen inside adjust_range_hwpoison(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/hugetlbfs/inode.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index a427d41fbca0..a6fcaf8317a0 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -193,19 +193,21 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, } /* - * Someone wants to read @bytes from a HWPOISON hugetlb @page from @offset. + * Someone wants to read @bytes from a HWPOISON hugetlb @folio from @offset. * Returns the maximum number of bytes one can read without touching the 1st raw - * HWPOISON subpage. + * HWPOISON page. * * The implementation borrows the iteration logic from copy_page_to_iter*. */ -static size_t adjust_range_hwpoison(struct page *page, size_t offset, size_t bytes) +static size_t adjust_range_hwpoison(struct folio *folio, size_t offset, + size_t bytes) { + struct page *page; size_t n = 0; size_t res = 0; - /* First subpage to start the loop. */ - page = nth_page(page, offset / PAGE_SIZE); + /* First page to start the loop. */ + page = folio_page(folio, offset / PAGE_SIZE); offset %= PAGE_SIZE; while (1) { if (is_raw_hwpoison_page_in_hugepage(page)) @@ -278,10 +280,10 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to) else { /* * Adjust how many bytes safe to read without - * touching the 1st raw HWPOISON subpage after + * touching the 1st raw HWPOISON page after * offset. */ - want = adjust_range_hwpoison(&folio->page, offset, nr); + want = adjust_range_hwpoison(folio, offset, nr); if (want == 0) { folio_put(folio); retval = -EIO;