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