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; }