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