From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92372C07E99 for ; Mon, 12 Jul 2021 04:06:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 494A860E09 for ; Mon, 12 Jul 2021 04:06:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 494A860E09 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6702B6B0011; Mon, 12 Jul 2021 00:06:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F9186B009F; Mon, 12 Jul 2021 00:06:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 499BA6B00A0; Mon, 12 Jul 2021 00:06:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0134.hostedemail.com [216.40.44.134]) by kanga.kvack.org (Postfix) with ESMTP id 1CA526B0011 for ; Mon, 12 Jul 2021 00:06:15 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 38C041E06A for ; Mon, 12 Jul 2021 04:06:14 +0000 (UTC) X-FDA: 78352598268.01.6BA1EA8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id EFC22B00019A for ; Mon, 12 Jul 2021 04:06:13 +0000 (UTC) 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=Gbm0utfzsbXXnIAuOZcZguZoSY9jTjSeePDJZQXsoxs=; b=MFsyFDjFnBr1Mnrx+gaOkMhGYG WIQUl1S3YKpoUWNkZ0l6sD+yZ/E1M6Y6td5ncFn69TcO3RbcCDhwi9j1baqJZ0AAjjO1C4/n0bboH S35StTL+gB4/+rc1MjIpDMe1d9rdS3ZIaGSaWkfk9vVaf5ylUfBqlf6RRCgXF69VO0nLN6z3ROXvM wQRka/HhSqupUV0f3TQNPMGlZH/d282J/OICJ5lFzYEKb4GaHSl7x6y5qkGsiDvbC70gaqRnXJLen WwJjV3JPFTViW9wNBdj58VZn5W/GHuPJFBnP2p271ST1M/dh5OrTiAyFKfIwTBSoXsHJAAC781X7i 0X3lMCLw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2nBw-00Gqsi-Gn; Mon, 12 Jul 2021 04:05:27 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v13 111/137] mm/filemap: Convert filemap_get_read_batch to use folios Date: Mon, 12 Jul 2021 04:06:35 +0100 Message-Id: <20210712030701.4000097-112-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712030701.4000097-1-willy@infradead.org> References: <20210712030701.4000097-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=MFsyFDjF; spf=none (imf19.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam05 X-Stat-Signature: c9t1jyw7qe6x8iwmymezeoftctbgponx X-Rspamd-Queue-Id: EFC22B00019A X-HE-Tag: 1626062773-199578 Content-Transfer-Encoding: quoted-printable 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: The page cache only stores folios, never tail pages. Saves 29 bytes due to removing calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 4920f52268a3..3d1a8d5f595b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2272,32 +2272,31 @@ static void filemap_get_read_batch(struct address= _space *mapping, pgoff_t index, pgoff_t max, struct pagevec *pvec) { XA_STATE(xas, &mapping->i_pages, index); - struct page *head; + struct folio *folio; =20 rcu_read_lock(); - for (head =3D xas_load(&xas); head; head =3D xas_next(&xas)) { - if (xas_retry(&xas, head)) + for (folio =3D xas_load(&xas); folio; folio =3D xas_next(&xas)) { + if (xas_retry(&xas, folio)) continue; - if (xas.xa_index > max || xa_is_value(head)) + if (xas.xa_index > max || xa_is_value(folio)) break; - if (!page_cache_get_speculative(head)) + if (!folio_try_get_rcu(folio)) goto retry; =20 - /* Has the page moved or been split? */ - if (unlikely(head !=3D xas_reload(&xas))) + if (unlikely(folio !=3D xas_reload(&xas))) goto put_page; =20 - if (!pagevec_add(pvec, head)) + if (!pagevec_add(pvec, &folio->page)) break; - if (!PageUptodate(head)) + if (!folio_uptodate(folio)) break; - if (PageReadahead(head)) + if (folio_readahead(folio)) break; - xas.xa_index =3D head->index + thp_nr_pages(head) - 1; + xas.xa_index =3D folio->index + folio_nr_pages(folio) - 1; xas.xa_offset =3D (xas.xa_index >> xas.xa_shift) & XA_CHUNK_MASK; continue; put_page: - put_page(head); + folio_put(folio); retry: xas_reset(&xas); } --=20 2.30.2