From patchwork Mon Mar 3 17:53:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999334 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 D49EAC282D1 for ; Mon, 3 Mar 2025 17:58:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED8E4280035; Mon, 3 Mar 2025 12:58:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E8966280033; Mon, 3 Mar 2025 12:58:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D50FD280035; Mon, 3 Mar 2025 12:58:22 -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 B5D9C280033 for ; Mon, 3 Mar 2025 12:58:22 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 61C37A4DF3 for ; Mon, 3 Mar 2025 17:58:22 +0000 (UTC) X-FDA: 83180999244.27.0FF12A8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id BD2D0180013 for ; Mon, 3 Mar 2025 17:58:20 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="MN/zpEt8"; dmarc=none; spf=none (imf06.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=1741024700; 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=oH16NlP8xxrt4wivtUXbkuoeB6TY0U2c9UggzJlO6Zg=; b=vrYMpiwb9fKFFa47pEkQ71KPxLc58B7mi3NVGhfxnAAKth0zccFGKorUb+q4jNxFeXXrSN l7HSwBN3A4py9cgShV70kuS6fHjjbD0w+IR/7c5vPdAiiMTutiD5XWs50qAPtgQ0wLcP5L t8GYNO4xh3IjjGry7/5hxFk8gldUA74= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741024700; a=rsa-sha256; cv=none; b=oznpeUB3I49GjMH8PJaL0RBTfSi0Yz2aEdnd0TBqh6oJetw7ulm8biqq2gaIkXJBc9Wjbc fxySuxDiAZ1sEbAubPn5odRaPHIut+8It4mOd2ESPVTHBWi28B0GSicSZrs0QB+Ktm/+Vf JRV3dChsYgaKfTXKf+U/VpyR8rewbOI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="MN/zpEt8"; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org 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=oH16NlP8xxrt4wivtUXbkuoeB6TY0U2c9UggzJlO6Zg=; b=MN/zpEt80N0N2X5802zEZW1Gzc PSjSmw+iD24oea5D/lUoixIMhX9FS9A25h0R6T5x84JqkY/qyjiI7fKCc8jdDoZz8bp6HcP7UyAMk XIE/yCy4eXRICMs96FZZxnzRGWxRlG/3J+GX9VoIfOcl48LAi9XuqVMNYec07cZ4XjXCS5QgMdMC9 feuDrqtpQhtHf/tFw+ZWMS36RARhb1g/ITtw3M+oRWf+K3F5uGXg0K5vWl8SR01bfEwp0Puq6zK38 uRqmXA0DYDuAzSqwnaS5oFXFiHk2OlgMhXk9bRCPyQ06yGYq5UxCUlknVropgc/MF7VigJ3Mg9Txm JLpoKnmA==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tp9zg-0000000DlCl-0Xql; Mon, 03 Mar 2025 17:54:35 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/6] iov_iter: Convert iter_xarray_populate_pages() to use folios Date: Mon, 3 Mar 2025 17:53:11 +0000 Message-ID: <20250303175317.3277891-2-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BD2D0180013 X-Stat-Signature: yjnoz6jnkwad8t37naz3tzhi9u3srhgd X-HE-Tag: 1741024700-456315 X-HE-Meta: U2FsdGVkX19X/safOsDMGpBqRCPO85mchXNBHDUQD2n8/a76kr89EYft7MECtbRds+eotqp6Q/qZgx+61vNT/oG8tfSpoubSMjLkjgq5qL1joBrYspeIbhrh/6XoUokDWrrXtirzl7QCaCdvO3l8WMaw32JMAPjhZcLLZDPiI++TWJIwqCGPa6o/xFSmHQYsKtlnBHOp5Inrq5ValwRLuh+8fMvFm96UGgpXJQAlA3PFWkz3UQr3Y2UXZUR3ctp+QQtD/jpjkxaKIc/PCt8Zm94ECrxzYwnKosB1kg/WzHuWIgTtAienyAGZwNnrYRlS9QsdH0131eDrXtucKaMS7hhKBNOfzIheCjBpckBzrThaazTnChmidETm+HnZu8TL1jb7BKcGY7kzdqaDRXkn9YbTWXlmyWab2ub+kI7ah+7J5skZDnbhAXjaaRN6bzmXxCA/WPBykemaeZaNi+WwIbclW/ShJ6sH9WfLy7yexGTUQ7PDH8m+xt4zJ+vvFtRwPNfM7pE82VpfJLJzpVKMud/QwxcSe4Rje2ZIqUhgz2o1mEtybvJYvDRF8iINFejIxOQ71VqmtJSZUXXZUIvTHq7rQrm/CsXxv/g9DCYOV5Ftx5QVOB6lf8V/JJmVC7ez/HeBOfxEqBwYs+Syaoek96eGNp+oc0AYnfdKWW2gxjp5LL1Ml877hqpxP4H2a0GmtYAE4QaDC+gcAQU7N12e9GHjCQlGGFLvYUzWoOOUJ8pPYR31Vt/66RczqKDVRbtwCJ7EZ4q2YYGGbgL3I5J8P9SkhAkBA+AZFQYoOEkM245pq5dPzZoOJp1cxTA3VuKBCHqavCHL6NpaM/r6bIzOtD2hMmOr+ldAOvK3P+LjVn10s7R5qnBDahLs4XM3oCE+CfxhnlzJMaJKAs4kYPLpnk+x1RAX50PNGpp8+CwQ/aFqjzj8cXwdotdKFFsrhANVVkvexM4Km54AXB0wjiK y1bV8GN5 WCpPPmnIX4lpByDbaex4TS+aQkrJYP1b983WjSa4RWoe4UPEB0yKsK6pSe6HJvH/3lZs/Qnbnd/1LSSd+WpVTAMi/33gYLtjBvK+1C4Xw/j55q5wSXYb/6Yvuk83hynFA84UltJun6BkqnGJBrHeS/24+lt6QrTetdA9sVDPiF42PFznzfLL15eOWQ4xOPE30mBaU3xscylrNSZxjAMUHTU9vUimuGmTRlNlLuGJnkTNGsVpqo6+p90NWNBg4zWVkuhogVyfRHoaKwoCgcOBSZ9WeS461RbHajcQi 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: ITER_XARRAY is exclusively used with xarrays that contain folios, not pages, so extract folio pointers from it, not page pointers. Removes a hidden call to compound_head() and a use of find_subpage(). Signed-off-by: Matthew Wilcox (Oracle) --- lib/iov_iter.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 65f550cb5081..92642f517999 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1059,22 +1059,22 @@ static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarray *xa pgoff_t index, unsigned int nr_pages) { XA_STATE(xas, xa, index); - struct page *page; + struct folio *folio; unsigned int ret = 0; rcu_read_lock(); - for (page = xas_load(&xas); page; page = xas_next(&xas)) { - if (xas_retry(&xas, page)) + for (folio = xas_load(&xas); folio; folio = xas_next(&xas)) { + if (xas_retry(&xas, folio)) continue; - /* Has the page moved or been split? */ - if (unlikely(page != xas_reload(&xas))) { + /* Has the folio moved or been split? */ + if (unlikely(folio != xas_reload(&xas))) { xas_reset(&xas); continue; } - pages[ret] = find_subpage(page, xas.xa_index); - get_page(pages[ret]); + pages[ret] = folio_file_page(folio, xas.xa_index); + folio_get(folio); if (++ret == nr_pages) break; } From patchwork Mon Mar 3 17:53:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999335 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 8D41BC282CD for ; Mon, 3 Mar 2025 18:00:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2047280016; Mon, 3 Mar 2025 13:00:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9CFEE280002; Mon, 3 Mar 2025 13:00:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87240280016; Mon, 3 Mar 2025 13:00:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 68C36280002 for ; Mon, 3 Mar 2025 13:00:13 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E498F80DE0 for ; Mon, 3 Mar 2025 18:00:12 +0000 (UTC) X-FDA: 83181003864.08.FAC8078 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id 42FEA4001A for ; Mon, 3 Mar 2025 18:00:11 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WI4+Su5w; dmarc=none; spf=none (imf12.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=1741024811; 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=ac55yYGUrmgmfjDkZd7lZLD1cRecm/nrYCkJ9H/XhoA=; b=AcVCXwK0P6jAS4knZPuLfV5lhCm0YqtxNW4/gP6NpmToADv3VzXYqrxFbwg8hUTpG/ODMR RZpT6H9T1agFNxo9Iw1mnR1zPKJq9kQ2fuL6U75A5joHpL27SedR7rNoKFRq1AFRgqRHeQ zurY1u5LJHs6vZcWLnQbxwLAnHSVrjQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741024811; a=rsa-sha256; cv=none; b=rmd3CzvvXyCWzH+SYn4ve7PSck1IcKwear0Nj950dtDIrQO3O6Xcq1ItWxaBq43TDqs60B PIhD2DxDgPr6k06z2/RzWHcenrW6XMJf6gpwY5njr2cJmrQrHFeEkkQDAbGYSbJHj4mnHP 5nYOIuiPho6aN1G0P/EQMxS3NPQaNqA= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=WI4+Su5w; dmarc=none; spf=none (imf12.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org 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=ac55yYGUrmgmfjDkZd7lZLD1cRecm/nrYCkJ9H/XhoA=; b=WI4+Su5wNeZh6dg7wStk7EFkqj sVln2SyYzf3X9frXhnAGuaK37AeqGdQrklihxMtovIrrzuAaPjGH218lObXI50mw0+WAdneVO/ijD ioTMwR8e7r7n0JiIRsR9gVA3TfZJ1Q9DsawKaE0G2pEHdkD4k0u85oDFhLM8Zy7awvITp9rPetKl5 NymWaqf7b5RNdPhqSm9w61VMBqg2+Ty3gOxunACx0ACwNb9tpxP4OaDK6RBk0asjaN2WpyWQwSQ3W PW8N5sLByxgueb5/70Lmrf9Oc2x01DVxA7TpyFUU5qAUD46/AodcgzjzxdHjJ4rpKQNBfOEVc1Iw8 iEeRRbgQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tpA20-0000000DnEk-1nep; Mon, 03 Mar 2025 17:56:49 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/6] iov_iter: Convert iov_iter_extract_xarray_pages() to use folios Date: Mon, 3 Mar 2025 17:53:12 +0000 Message-ID: <20250303175317.3277891-3-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 42FEA4001A X-Stat-Signature: d439as6cgeaegjqy7oxejtkchpm854an X-HE-Tag: 1741024811-491826 X-HE-Meta: U2FsdGVkX1+KH1EtO8+6WoZxFCSvaVp4boG9aAlVDxZrdNX/8JjXgOCbK9pw9X2WK/ERbp+Fb0sgNRbs1/8VEAScNC4FgPCUQlFOfZFPALikam3ywKiF1UmV/sQEhsB0jV1TZKhDr17HfBOknL5akq85Ygp8njewz3xooPtOCvq4xy3ahg/ZHYQ8kOJgEy5r5OpyAw/3ogALNODOny+ZefzyAbWTGOPwAKPnvJ02XhTLIKvsUfLY7CK4fASp6/TnNm/GQ/tIZu2Mlneh3lfnMNwlCmBqjq1pKIJhC0xj2/nIYpjgOQ63U/WgIAInBn0pjAtf93aSy2pNUeOsXMJSBKEAonFqwB6ItaCXnEXit+8FnpiW77C6aDKUMMjIQOd35b5ZSpfSe/+uXa4CVs0qgb2UP6YfcWSk5Dl+zv72dKTRdDqivO/pGrfN6ZiqqWNP5xOz8iEDxJ2vU6hVL1KoQ2PDCM7sICcCBz0Kk0gfM04pRkQXomeBUdNnJlC67MFzzeoNd6cR+wivBCnWT4SRMh14wiWVmQzmF8LI84W0eVl7489hCGjoFe9rogjimIh+GbKHsE53FD+JFDN98OdbTIMYbjyZYKt0hqSlESvqU0IR/q4oUtxRrGepmtgtYa++OeKXAlOrcV79uNTW0hpWKAdU0hWBCptciC/EJs+3gV9pn1gdhNPhM4vxBgi/wuwLSIVyIc6QeI8tQIohMVZArX49ViXXuFGBG9FA76IsD/ms/7rmjbAb1KBd3BJLxWjwBNfNowhEt4c56si8Mk2I46aE2msYojnH6ixO2ykLfcSuWYJBaRCPWTaE3L6FWcwnrtPxt1hS4eGgQcOIfJ2mv34bCTvZvDUQouWN9Z6b1gI3P/mvWH4wwHrsY57MV+NY3FHrpfgkhQV3a7y5kaQdE89RUO67beGPR2J/Wznz1OJ3yDTbG6adxJD3ZzZiPIBx6h0Nt+1HJMd5bGHue7a 6qCE8dvL K0CzB1fmtmN9RSXi5wRrxm9EryEQ/gPOo7ljngwCt0IoSRCPExdLRPPEaz/IANg2s3CR98iTD0FnVGjeXPfGPmkFupn/Rs/pSOHc0NGPvFeGlrIXRKXdGwSLnDxQTpliUSqfIwM78cx+P636CcOzYWPyOxXLFSWuD9rs4zrYCwFzuPh81zAbCtQzrlKq0XN8FJIwU/GOXIjZ4GLQECTswDnpdp0hAR5j+0CPySkHLTiR/xzrh4Dj3+OKCtdlgp73NTRvjJXrWVIRebPQFmR4UXqxDNVxjOzbJsHBd 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: ITER_XARRAY is exclusively used with xarrays that contain folios, not pages, so extract folio pointers from it, not page pointers. Removes a use of find_subpage(). Signed-off-by: Matthew Wilcox (Oracle) --- lib/iov_iter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 92642f517999..c85ae372bc05 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1646,11 +1646,11 @@ static ssize_t iov_iter_extract_xarray_pages(struct iov_iter *i, iov_iter_extraction_t extraction_flags, size_t *offset0) { - struct page *page, **p; + struct page **p; + struct folio *folio; unsigned int nr = 0, offset; loff_t pos = i->xarray_start + i->iov_offset; - pgoff_t index = pos >> PAGE_SHIFT; - XA_STATE(xas, i->xarray, index); + XA_STATE(xas, i->xarray, pos >> PAGE_SHIFT); offset = pos & ~PAGE_MASK; *offset0 = offset; @@ -1661,17 +1661,17 @@ static ssize_t iov_iter_extract_xarray_pages(struct iov_iter *i, p = *pages; rcu_read_lock(); - for (page = xas_load(&xas); page; page = xas_next(&xas)) { - if (xas_retry(&xas, page)) + for (folio = xas_load(&xas); folio; folio = xas_next(&xas)) { + if (xas_retry(&xas, folio)) continue; - /* Has the page moved or been split? */ - if (unlikely(page != xas_reload(&xas))) { + /* Has the folio moved or been split? */ + if (unlikely(folio != xas_reload(&xas))) { xas_reset(&xas); continue; } - p[nr++] = find_subpage(page, xas.xa_index); + p[nr++] = folio_file_page(folio, xas.xa_index); if (nr == maxpages) break; } From patchwork Mon Mar 3 17:53:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999343 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 09C43C282CD for ; Mon, 3 Mar 2025 18:01:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D821280038; Mon, 3 Mar 2025 13:01:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 78776280037; Mon, 3 Mar 2025 13:01:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6501D280038; Mon, 3 Mar 2025 13:01:14 -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 473A6280037 for ; Mon, 3 Mar 2025 13:01:14 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 081CF140E1A for ; Mon, 3 Mar 2025 18:01:12 +0000 (UTC) X-FDA: 83181006426.29.0039E60 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id 8D82DC0024 for ; Mon, 3 Mar 2025 18:01:09 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YgwKMYWd; 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; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741024870; 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=4Fso8EI/ac8noZP5COjS8e1jpZSdYEWCWF69/ISSz5w=; b=mD8HOppqNZxZFZyUptdKH1XodgUQOeSAm8DO/nPWHmynO480s43MXhr4sszfKU0J5l6aIB fLdOkrTpwU6uW3coLcpU4fJhm56KaIvu0u6L6x8SeFrQG66Ba0rdHMWa5yHkWWO+IFEqsf i+IUDzpdyHLnF34nNgOC1thv25+zZBQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YgwKMYWd; 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; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741024870; a=rsa-sha256; cv=none; b=k0+DjIfTMOQkVtyW2AyCXE7NUcvqK4d4RFzypH6Z9a86lQLtzASmVf3iPyWlQgGb8OPwEN 2sOFo6ybWdl8+su2CKgGNakWtowueym9ovGlzoLypMiTctbmlHc0rphs6Iym/P/jt5Mftx hrMAwflbmf62y9BvMeZoZoBJziorOIE= 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=4Fso8EI/ac8noZP5COjS8e1jpZSdYEWCWF69/ISSz5w=; b=YgwKMYWdVA6BXZ0zMwzEmFFQ5L bWYLvSkcg6+F0gfp9f94CTLp7+znhPYmWCXrVR6anLxEJisRZtad8sbHkKBeu9vJHmI+B84lZJbg6 og15e7PyL7AmgxL7jdV1fz9jWBcGSkDxUciKsrI5dBC79Eyc0zWAjzm9mnbFMzBB0TgiDER6FPniM tVtq73LP01vEW9VTQlMtABHCk5XhezymXUaz1msmzOabtvZhA0lZ41jr05dbHOADtO/WfyMvXnrdF R8e/o0005bXw1XQ/UHrygEgM+g3bl79+PJXR8NKAd1K6PkATw1RDEDdp1+5sQVHQbl9iEm7PJKzqA EjECnNtA==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tpA4G-0000000Dp9Y-1iRM; Mon, 03 Mar 2025 17:59:26 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/6] pagemap: Remove find_subpage() Date: Mon, 3 Mar 2025 17:53:13 +0000 Message-ID: <20250303175317.3277891-4-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8D82DC0024 X-Stat-Signature: coiw8iaubq34uej4gdsii8ewcemtrhmh X-HE-Tag: 1741024869-915724 X-HE-Meta: U2FsdGVkX19bEuJ2v2l/sNxOymplNHZeJFwD6IibWE66zmoYiAb/IWzAJIH6HUnhvIIz+OXVTz2HAC5upJFF45lzZK3grhyvNn9ZBwystWNAeCRqddaE6QarCQ/EnrONOnKnzrP5dAjGNUMs+rXFLql4lM2Dtb+DuBHDDjpBu2myMUDYL5IDBPKHniXvX37rfqyQrAiiInCI7FroTg8Hpaa80ga+lM2putKUCE/7vOxW2glu3IXeI9uOBJReFHv1li4UZxiKz1DPhWER24BxWr+e2phNN1a5nRpASlh2ZiuFX0DKlFcAl+TJkYoR+tHyIhXhQsIzeqpkenfovyjF2yvKw5RkvALANwBtyS1vxBWE/hiUqofKAKw1zCXbi8YBwyHrnGD7tn3b17jAsJ0KaPn8lIoYTsSIR6ToA9/ZF5aOCk3vsZQpmyt3KuactMr7W/pYHK7UKbboBcTNHl3ELu26iJF9GVltMcPM9zY1sdkQ9iQfw0Y2LYAtECb/kjQel2ldNT6DLx4Q3nEQ9pBsL9h139uLGxmzyAWvMuV3ifnSHNb2K5uOn7J/6iUBt5kYlsojFCEZ9L+DRYp7GbxCTXzaxw2R0zaTuwcxvXJqb0gfniKSR59/69EsOPioUtvI+zFw3D7iqBCUvvsONo6l781tHDUZBIc8QFOb0zBNnm4WYT+B8I/zufA+FMQfeO5LZ3G51eQ1fufuKZ6ajIYeF14qGNSNnoC7YlpXFbOCaIiy7pxEljQHarOFxZ6a38Qk/YrhyG6Lca5bsJTOhk30WibgNhIdD8MBYs5LICuuEFmrGvrTNoEKZv8uyop/RLH2BmgE8gNZ9yAwXuhh6zhCN7/YgpJ4YbswyMboaJ51zZbC0h64uuS1PAA+RE3jKct9MCVz0G7sm2XVPFMHv8HZTaWkTRA1dt3/xQrQuldtcA4U/xxh7heExduA3DNk6x1GTjj92kkHp5CL18MyhcR iW14cR96 r5wW9+8Jukj5Z5VlS3c99KxCycf4bS/SJhGdCG/GDiRk1Xbt3hUnmwh+Od7Ldd+uEf+LRKUd88tzw7Dwngk8csbb+DE/HL7Mq2mgKVm3ivolgOVPLZhv/hxZzrzlAKYiqKxUzDcAS3h6xu1BTKtU5fihFZCZog5Xr6eFHfZI1ogsMPFEIz9jZyQyHkGL+3sknrlXJnzZ83btG46+cgfpSD+Uc6KmJ4mrqWFws84ym+iAqBbokBD47Icd8CxeXs+v3X6jofEE0ZAxgn2ms01oZTp6T6ZCVPuorFT7M 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: All users of this function now call folio_file_page() instead. Delete it. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 798e2e39c6e2..e51c0febd036 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -945,19 +945,6 @@ static inline bool folio_contains(struct folio *folio, pgoff_t index) return index - folio_index(folio) < folio_nr_pages(folio); } -/* - * Given the page we found in the page cache, return the page corresponding - * to this index in the file - */ -static inline struct page *find_subpage(struct page *head, pgoff_t index) -{ - /* HugeTLBfs wants the head page regardless */ - if (PageHuge(head)) - return head; - - return head + (index & (thp_nr_pages(head) - 1)); -} - unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch); unsigned filemap_get_folios_contig(struct address_space *mapping, From patchwork Mon Mar 3 17:53:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999344 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 18166C282D1 for ; Mon, 3 Mar 2025 18:01:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BDAF6B008C; Mon, 3 Mar 2025 13:01:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 16E576B0093; Mon, 3 Mar 2025 13:01:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00F9B6B0099; Mon, 3 Mar 2025 13:01:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D2D3D6B008C for ; Mon, 3 Mar 2025 13:01:23 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 25CABC0DB3 for ; Mon, 3 Mar 2025 18:01:23 +0000 (UTC) X-FDA: 83181006846.18.1E2B90D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP id AC7D84003B for ; Mon, 3 Mar 2025 18:01:17 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=C2Gcgd8a; spf=none (imf12.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=1741024877; 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=mhPMBfMr6QjIX4xpzAErSRJyHiDJ/wVChcGhzQucYw8=; b=WAS/NRPsKY0OHxUhEOSfGlYJJccaywF8Z379rSMFua/ljfdzKdpcgLNAyfD6MJTHH+Psca lxlFkpjP7ZWWfZRpk1rFA8ZSPdrtkt2UfLfLjDRI7Birlm6sTm4Lwn1T5WiJQhS6O4XS6W kf6mANx8fW7TQWZaAia7ldN9ttNi31A= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=C2Gcgd8a; spf=none (imf12.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=1741024877; a=rsa-sha256; cv=none; b=G+jEeRnvHWS50fXlHyJOq1M/Wf02T/xXpPgNKIX0MNF+h1l4859yYTVUzOKDwPJ/hCWI4F QEDSnbxW4Zgg24MM4PwPGFetULKx0axbMBm6BaguUjf8aQqWJzak86izznUTUWmhcHYvT0 Ri3EA0RNRUvdYC3mVd9B/1AUtQi5IXc= 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=mhPMBfMr6QjIX4xpzAErSRJyHiDJ/wVChcGhzQucYw8=; b=C2Gcgd8agHSIQ1790V1Wv10iNk 4Ix+WsA8iv+U8YNxjILMKfqqOpMjasBQQDlplBeOayYQlCVjOduBqcYvyf0iZDSO0hElsSEs2Y6zA 3U6q2lZ9jbLmVjmIopms7q5ht3dFZMmQrEzMDcSIiyswDBkSwoEQeqdGYuNIGhwRpwdeAGRdqERpd LTuIAlY3A/ub8VCtHLr+OvtfWyOY1S/exosr7ekFfwjs5uj1vXje+0JgH3Nm25o+Vg5jXW0os+GC/ 7u7phC+CbUpFD6CUhHcuH06UcjRtph9PXh5dmDLAUtZC3TuSJntxM0NL1b5v3B7ZlxDbP8EiPHA4Z oVuRXbDQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tpA64-0000000DqU4-2rOs; Mon, 03 Mar 2025 18:01:02 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 4/6] filemap: Convert __readahead_batch() to use a folio Date: Mon, 3 Mar 2025 17:53:14 +0000 Message-ID: <20250303175317.3277891-5-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: a6fi1dgs7z7oiy8w9d51k38qig7j4t4q X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: AC7D84003B X-Rspam-User: X-HE-Tag: 1741024877-453773 X-HE-Meta: U2FsdGVkX1/2BD3l5NvahQGRpHMPSYxl8SkhEXH7XlBwGdsGd2ty2E2h8hLMYNxy2X+BzAInCZmDgYgMxbB3E9P0TbMSjitSQZbkdH5451zRlvjDGw+MY3RGY8jQ0n5lndpA2K6HYLgb+oFvxSCwhOxM5BsYAldv5lZefsCINmcbwYF4qo5IqFKFEMXZ4OlzWzRkCGQuOxEx6LiUTcwjvNIeLy1BeoMR9W5lqkPUP5UItmx9cAphqOvPraSbaZmiL0mPxLFje0T4P9dLgo5mfwz+5w/LJ68l+FglMkzQj3Sv+YIuPSz9xK3UP+I0Msy1mkGnOQCubGblU4c8z8X/bGX53gSc1q5SUQ4TYsSRbDMxk+AKWPmZiJt/924NRb4iGGuUyjmtffr+0QGnq2pI0raLGjF21FfCLxWYWJZG7s/49zHszucNHQ5Ue8+I9u2zI5CiNLF43UQiAPq0JidwIJ+pMOicgaBZbeX9ZX3njtC6ASELrv7Pb/9MM3/EMLk9Eh7kdl71YSdMJLRO7xpr4J4eYhEMSwCqVME5s+pPwIf30JE/h0SzXLvNYZllzcrklFSjgFuhGE4lPuKtCL8tpsavEU84CeiJ1iklioD1QEenX0nsEwgO87QEh8OAIRaWlV4XdGBvjGZ5dgZ8YrO9mA5/k9Ci/CpEc+aOABFV94BVbeRGTtJXItoXLyD3geJBRUt8+zVZWGIDsuBhaW3Wkby5dzL9b1uuMo8vTziicGmuNXA62Foe0uFnjIkhuD59yZmZiT6MDHcp/apQ7xTtdbe4xWgi/yJcXHwwNo0QLWTvxYzocDi4naQVQSKYNjVUkhBCHgnL3S1MZje3srZ4lisllIKSScr3IxcDxzaY9ZOlwYQza+Va9JbguBuhC9Z4kj93sz59qQhSzdR40f8Dl9P/7oSv7IrNiOcwgXba/eyJS6WNhyuDc55LfluDW5xgIX3e4i6xsq9pLrr9YQU dTU2DQBP YQ0fT7DMsLR8EfTEOBQ0B3t7q0wsS4OfLu9zJz5PWL4JcPt7/Ed6F4tU8rn46lCnbZ5DuC9lMbZSPNIYnLDcL6vvTDKjYNbmkYfrXIiZJ1lDHmNzl8Qi1ePGr2lH9uhV8oMgS+i7UhVzhErVr+jTB1Z7m4GFulCWKpHBJ8Ej/S34etwjvxPeNJHppd/TFyElJV4hkxMvLsJTDc+O3BuaWAwpE1t0JkdKkZZFwMlDZF3qIPOMDPkK34sVHyoDH0EumxQ2/9+M+n4GgtqxkgcjLAXZwa7qeFkK7lnb4 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: Extract folios from i_mapping, not pages. Removes a hidden call to compound_head(), a use of thp_nr_pages() and an unnecessary assertion that we didn't find a tail page in the page cache. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e51c0febd036..f4b875b561e5 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1449,7 +1449,7 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, { unsigned int i = 0; XA_STATE(xas, &rac->mapping->i_pages, 0); - struct page *page; + struct folio *folio; BUG_ON(rac->_batch_count > rac->_nr_pages); rac->_nr_pages -= rac->_batch_count; @@ -1458,13 +1458,12 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, xas_set(&xas, rac->_index); rcu_read_lock(); - xas_for_each(&xas, page, rac->_index + rac->_nr_pages - 1) { - if (xas_retry(&xas, page)) + xas_for_each(&xas, folio, rac->_index + rac->_nr_pages - 1) { + if (xas_retry(&xas, folio)) continue; - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(PageTail(page), page); - array[i++] = page; - rac->_batch_count += thp_nr_pages(page); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + array[i++] = folio_page(folio, 0); + rac->_batch_count += folio_nr_pages(folio); if (i == array_sz) break; } From patchwork Mon Mar 3 17:53:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999345 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 81E4BC282CD for ; Mon, 3 Mar 2025 18:01:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76396280033; Mon, 3 Mar 2025 13:01:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 712B86B0099; Mon, 3 Mar 2025 13:01:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B441280033; Mon, 3 Mar 2025 13:01:26 -0500 (EST) 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 3C70B6B0093 for ; Mon, 3 Mar 2025 13:01:26 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C684FA4E65 for ; Mon, 3 Mar 2025 18:01:25 +0000 (UTC) X-FDA: 83181006930.22.BDDE133 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 70A3D120008 for ; Mon, 3 Mar 2025 18:01:19 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="EC642/Q+"; spf=none (imf29.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=1741024879; 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=NPQLhzTyEMzPLgCXVEdgocc34iqkc/85plAdXTJVcFA=; b=H11QUIt5lWwhldG60FhZnMFNP/4U1gOsBkX58nQHDeqhaZdHxDNOXd0qfK5+uDZeiEUW30 1ncIy1OIU/HWzwYBJxD7TETiQfL/r0ylrbrjgCoQHukcWMITb06+btsyM18mJDj3IPYn46 Avsowjo3z9Kjj9VvbVo6oUZwAoJvM1A= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="EC642/Q+"; spf=none (imf29.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=1741024879; a=rsa-sha256; cv=none; b=vlEQhSSHOomOoLappIPIBV1GW2uqwkpfjSabgfJWD6VPdAXClplrnIy5xT2/jxgJpEj7vi N8nYKLlT00v9SSm05k116ny6ifiiq1tlM25XaM8RSQJSf3/MfyFkg70iLeEwVXrhjRESiT Elp2xMiqQ04IcP1LKwLqQv1RphZmu+Y= 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=NPQLhzTyEMzPLgCXVEdgocc34iqkc/85plAdXTJVcFA=; b=EC642/Q+e1n8Jte66sDcf2YMpk ik8RpSlGYjW30isIt1q9YXZgZK4A707jQZLUxBboa0n6M4VbZAlqa7ir9f6p1Z0O2GKux1uqtGS6V tkjojKOWm/hOmI5B6UdsrLdeLLX03J9W74sQCd+WxdJHXGNI7QOvmhFWLaUdfU59UXMkj7LY8ebHG OtsfLp79FfZN2RkOR/dkh7+JZAoDqzwXcePI8uNmnv1HaYcZ0yy4Cord9IV4yq2NK5P9iob8CVa7X DTgQ+BEVXZ55F7RWsiT/Le4rccCBbS7zoVCoPyKrSafs9RCuxYxDpSUmxcWTpFfofe9wpO7DEq/Zl 9fkBYBkg==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tpA6G-0000000Dqcg-2VVL; Mon, 03 Mar 2025 18:01:10 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 5/6] pagemap: Remove readahead_page_batch() Date: Mon, 3 Mar 2025 17:53:15 +0000 Message-ID: <20250303175317.3277891-6-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: p4zmqhxmxnu7dmurda3wkaiprpbak3de X-Rspamd-Queue-Id: 70A3D120008 X-Rspamd-Server: rspam07 X-HE-Tag: 1741024879-536969 X-HE-Meta: U2FsdGVkX19n+yP/KQoJIvtqZkglSJvQDj9NdWGk7jbWtDFoXT10FJnIlaQuPPwo96LPWjosScSEfXGUO9/x4WSze850zt5nPUkcY1mg/v2ZlT4gCXZy2p2Dv+kKrvVH8flGBS2QZjymeIOSs9Ak2WzaM1Oftel/oktWQmaNP7U9oDQ0QOy0aoT04rMwQpum+suRbZxeS3rxD72mjjhWjK06fYAwR/E00+1CpbYCYjo8ND82KK8fLiInwXpwDAYYSEzw5053CNwlgUkEWCB34xvnnzxTZ/bTiPAmzpw9JGr3DV+p+pB2UyaHWBz6AeKHAwst8yjM3Lsi/WZdNGlfLuL/vrHmH8q7ph+PrkJ4ha/pEmjD13cxkr3z3xd6/2Ch6TTygz8mQOGFoZGR5wTwYfbArxak9qWXi0hvWy7C59wdr32PmvmkDsx7cXFkWZBYpkHXNr0ccOXLh8VDA/ETwVJDwwuKbb42DGDAJYvzPtfoXwfuSzIftK0L3bCu6/2wMmnIn0ZiMTbbzt8HIKiPgC+ezOsQIv4nwovM9MuUuaEqrAyr+Jcnw1drPgZzDGGPxdYyH48xVln4QiiAGnjWCpTQW8HMRjD0k5bbf+TADTcrVqFlxfLw0SE63U6j2gq9CmbBLOqyxtf6asFW7BZoraz036g1IFD6fJqMtQzloNcM5DfvZ+RzRaJHyWWEtyrLNvB/WOECsn/aeODmyFwKaZ7yej5WW6vj/dhA0Rc21xEZD7GR046Vm+WZjba5zJytrA5vD9RL5+/oNoGme75up72uZGGaKP6e7CQ6IATsvk3YhZvM4jkFGcvHDl2NLHjYLOX3rLgrk0K0iI7guor2vZbAdB+RK1fDVQOpSmofCHw09SXW449qBYat+SvQwzFz0Y+3+ZOqXMohV+/hyixMEn3c8DHOhxoCA/Zsx32YNVKf95j/OvhQtgVnb4UvdIKSeV2RFdfySe3BdQMxIYt gZfmv6Vr +Z34fj77AbbiEtwzE5iYau2Nk5HT/qEANLYqFrmRQp+QYEZa0URmPB0anojy2sBPK2q1/dBNRMfouLBHVGWrpdlzY3ceWiMScWzoFBDz/Mug5754T9D8QzOz7OpeAkpOkNd9aX2m5MzFgapyJbgd7HYGxLqWA56LxdCiHRA6YBHHu15ezQLaldBKNDdHJoH5OmQihLcGR81Q96nqaZTfP5efjAyfX3e48oB6xzPDv3r2Q47Xl9zNm51IBPKrUdidJ1LtXK7/akhsM9fmTfe9Mg6PlpwcmuagoEBUV 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: This function has no more callers; delete it. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index f4b875b561e5..4a1c9dc92d82 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1472,20 +1472,6 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, return i; } -/** - * readahead_page_batch - Get a batch of pages to read. - * @rac: The current readahead request. - * @array: An array of pointers to struct page. - * - * Context: The pages are locked and have an elevated refcount. The caller - * should decreases the refcount once the page has been submitted for I/O - * and unlock the page once all I/O to that page has completed. - * Return: The number of pages placed in the array. 0 indicates the request - * is complete. - */ -#define readahead_page_batch(rac, array) \ - __readahead_batch(rac, array, ARRAY_SIZE(array)) - /** * readahead_pos - The byte offset into the file of this readahead request. * @rac: The readahead request. From patchwork Mon Mar 3 17:53:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13999346 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 AC501C282D1 for ; Mon, 3 Mar 2025 18:01:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EDD1E280039; Mon, 3 Mar 2025 13:01:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E8C32280037; Mon, 3 Mar 2025 13:01:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2D74280039; Mon, 3 Mar 2025 13:01:40 -0500 (EST) 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 B5F08280037 for ; Mon, 3 Mar 2025 13:01:40 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 47A7D1A0E7A for ; Mon, 3 Mar 2025 18:01:40 +0000 (UTC) X-FDA: 83181007560.29.313CD30 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id A3063140036 for ; Mon, 3 Mar 2025 18:01:33 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vFudsMSq; spf=none (imf09.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=1741024893; 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=RcgDT1xygmH/LT/R5zLj021l+cmpyVBR/9bFD0Q5VpM=; b=cSRZddXj0sJlT+l4yJ4Zru79LLHK3BodJfdOpySRkyIAC0OhMUcnbpcEgsF8vqNYIsUppk iZaW+c7U4yLIzzJu9bcDBUbZFWDnRMw6p1r/9ixWoMirlCankOmk4pGxOMBz+NamdOyxqs rYQiycFw2XNa0a2e8jvDtDk0Xbl+to8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741024893; a=rsa-sha256; cv=none; b=WuKOOZMa60vfROGcIrT1ESAaqJvP5Ne+af7754x3+EW4bDQukcFfsNv96egBUqB5qdKmoZ E8+4sdqPifzux9RVEwHIZOX785coaR0yxb65tnOF5OIEjrdcL9k3PggkQkqo6Oc/QLvkC4 NoPXUvRWNlOUkgGolRLP5lPilSQGa88= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=vFudsMSq; spf=none (imf09.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=RcgDT1xygmH/LT/R5zLj021l+cmpyVBR/9bFD0Q5VpM=; b=vFudsMSqkBn0xDDBiohbJEXHLa QLa7rHLnHAHYbpGTgBHCdeLaPxR/eDwkZ9Ogx8VBR6L5XhLgy+lJNRMNSca75E710QSEbHUOoNo1M L76wf7Jq9JAkMW/BsypioJ8w34UKNJyybD/t+CBF7TLwnFVUNaz96fEJQWnsaG+po5ISvbAvxc4iU JcmcWMhhFoStOofzLSG+0JY492ZJt5un3fqPpi16J3scE+Sm8eBrk6riOtX1CLMEIus+QkBd6sEIb Sl4ikXfWkJxHzG4hlFdcWc/5wgjBhQezQMrW5xk/ccwDsgPgRlM2KqdndnyrSmYcLgcVY5WSDE1pZ 47MKkj2g==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tpA6P-0000000DqhH-09Od; Mon, 03 Mar 2025 18:01:17 +0000 From: "Matthew Wilcox (Oracle)" To: David Howells Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 6/6] mm: Delete thp_nr_pages() Date: Mon, 3 Mar 2025 17:53:16 +0000 Message-ID: <20250303175317.3277891-7-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303175317.3277891-1-willy@infradead.org> References: <20250303175317.3277891-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: birm4butfdwtoyrdrtwq838cuh5iuxhr X-Rspamd-Queue-Id: A3063140036 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1741024893-572536 X-HE-Meta: U2FsdGVkX1+FL7Mz2CUF4idvtSTN7pCW3zzTrnJ02bie0ghlSI8I1yEr27pkYEskWePzELK0/rLzFw6Q1o+n0NxOoGnHFx4NZKPtFUwiIi3PddzgV4VTylcUQKX9j7MZ26eBfgrauYMFdTW7opbWTEouTo2i+9m0tdzmxUU2yMlo32UzTcQ6HdY48xuiv/4RUiO0Cx2p9Qr1Lth3YO37ctO/x9l4uG1N6FyfPJAfHvXoL2cWd76HQgxsFGhuKqrvMf4K6OVogtQNHGPOZF7qwfEqQ98FhLsaHph0I81zZR5oGuXjBfEh0nP1wOFeof+bzUwQTF4M6nM9rzEMxFuc9poXeDjerB2OSJ8KKWzXKrEtpJmZ60rNnnlQ8Kiz6J5djgXaMtoBZCOIYEZini7mefQ7z/JJxTytVp9f6bK1Kmt/kD3U6EGD1fzXRY5wKQrBmAwGgUUWVqC5CGBZamVFtAkDxR1fqDd8z8THUnBqDRi+Ky8nM72AlMazUooyGJTGM2pevSG6CWjWMxU7Rm3ax0Twaz9Lt9bKJO5jHuF13sLGVZv80QRBSJ2AwBRZhwfCLZBYGqilZDwsSu5OwSdh5An5DRZjWWyC0EJUhec046wl/AjWRqWZlfxblV50gxXtkaBWKZJBCJqh3TIY1eRSw+kqqNoZFdvvaO9XrVy+1xrUUfxjTo5hULmYSIH9rH26i0WnZg5dkjYiFQFwOBsCaUeTalRWHZq5MywuwySC8yNahg6qbTf/DuuRgxJskzq+MBzd7dLiHRuHrwaukrwTAxRSi5eny3NI2zdw6Se/kFkLtVybh1XLtlXZ4PsfLpno1v+1BEipl6PurJaoOiZgkDKM80Y088v+MStUrqqoJsCu1B/tkfOI/6pB5Yh7K2Ad5LNzvCzxyRIEWFEowS8VHUrqu1Z+cxj2mBsYvaHFvxVir1/FpOAN2Pkg+QjaucL+0wUv4jKGrIcWvRl3JWI r4Rl5Xzd f6ZdWsXS+JmEE/03txrn1OxHJWABlY9RsWsnaklrqaR+BcRBOweBFx9/jWGbsBQS53vPpDHvY5yQ+dxDuIWh1DRXvArFXyfXPw7AulfY9vC1zm9gpGT6oXeKww4i5rOnzcilMA80S8jQpiLMQXq5PRcXkrHPY7U3oK7iN50pg9SR6GRSJxXTr9ESTDGQoioEx01FAHLRmXuU52omQklDhczR40mzu0BM6Ww+bVbQkTI0WbRWIrpBlH/2/X2XHrgDI/zZPnDLjV8/GGENbHzr/BxDdEIp3VlzxFmNb 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: All callers now use folio_nr_pages(). Delete this wrapper. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d5844ade822c..39eef633d725 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2129,15 +2129,6 @@ static inline unsigned long compound_nr(struct page *page) #endif } -/** - * thp_nr_pages - The number of regular pages in this huge page. - * @page: The head page of a huge page. - */ -static inline int thp_nr_pages(struct page *page) -{ - return folio_nr_pages((struct folio *)page); -} - /** * folio_next - Move to the next physical folio. * @folio: The folio we're currently operating on.