From patchwork Wed Dec 8 04:22:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12663805 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 771AAC433F5 for ; Wed, 8 Dec 2021 07:03:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B3206B0071; Wed, 8 Dec 2021 02:03:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 063586B0073; Wed, 8 Dec 2021 02:03:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6C776B0074; Wed, 8 Dec 2021 02:03:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay032.a.hostedemail.com [64.99.140.32]) by kanga.kvack.org (Postfix) with ESMTP id D820C6B0071 for ; Wed, 8 Dec 2021 02:03:35 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 010CE601B8 for ; Wed, 8 Dec 2021 04:34:53 +0000 (UTC) X-FDA: 78893361708.20.89E511F Received: from relay.hostedemail.com (unknown [216.40.35.100]) by imf04.hostedemail.com (Postfix) with ESMTP id A428440004 for ; Wed, 8 Dec 2021 04:34:53 +0000 (UTC) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4E9E26040E for ; Wed, 8 Dec 2021 04:34:53 +0000 (UTC) X-FDA: 78893361624.14.4B7D2C3 Received: from relay.hostedemail.com (relay031.a.hostedemail.com [64.99.140.31]) by imf23.hostedemail.com (Postfix) with ESMTP id E2E419000093 for ; Wed, 8 Dec 2021 04:34:52 +0000 (UTC) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2263D60A27 for ; Wed, 8 Dec 2021 04:28:40 +0000 (UTC) X-FDA: 78893346000.16.3F3A2BA Received: from relay.hostedemail.com (relay028.a.hostedemail.com [64.99.140.28]) by imf21.hostedemail.com (Postfix) with ESMTP id C2C7AD0369C2 for ; Wed, 8 Dec 2021 04:28:39 +0000 (UTC) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9155320A09 for ; Wed, 8 Dec 2021 04:23:14 +0000 (UTC) X-FDA: 78893332308.19.A08D191 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 41579B000181 for ; Wed, 8 Dec 2021 04:23:14 +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=/Jrg5K2lm0b8mctZUfSr5Z1cNwHiyfe9P0jRf7cbjh8=; b=EUeKL+/oZub5WS+fcIk5TDXrNv b/hrZwkF/9xfkhxX1ONt53rcg6HvZ+Wez9MHjE4HWnpz5AIJeyn2cPHRJ+mJRP65IyfWNKKPoj4m1 YDWG9bcS9duVzCCrf1rQcugMsCXXvgb7KV6ubJvkQAKubjI9DSuzCJPB4CVys3CyszJQaRVjEltoV 5vpEvMy9vUhUSI9/Hlrri3UKEj6HgIBi4xLGXPnxZBpwEOXqY+wgZo8pqJeDfeny8hQlAoW5sq5v6 ClPlMoyS+NgLHcmNTZDGqMaKDfeb0Do6In0fqHYoQ2FB+gruQdONAnkdfQSGUOpzBlm3nAYW5O2iQ +0hhvB0g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1muoU3-0084Y6-HU; Wed, 08 Dec 2021 04:23:11 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 17/48] filemap: Convert find_get_pages_contig to folios Date: Wed, 8 Dec 2021 04:22:25 +0000 Message-Id: <20211208042256.1923824-18-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211208042256.1923824-1-willy@infradead.org> References: <20211208042256.1923824-1-willy@infradead.org> MIME-Version: 1.0 X-HE-Tag-Orig: 1638937394-578674 X-HE-Tag-Orig: 1638937719-203566 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: A428440004 X-Stat-Signature: idrftft8oyc1zsgb38i1zwgx8td6ioma X-HE-Tag-Orig: 1638938092-723514 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="EUeKL+/o"; spf=none (imf04.hostedemail.com: domain of FILTER%FILTER%FILTER%willy@infradead.org has no SPF policy when checking 216.40.35.100) smtp.mailfrom=FILTER%FILTER%FILTER%willy@infradead.org; dmarc=none X-HE-Tag: 1638938093-805267 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: None of the callers of find_get_pages_contig() want tail pages. They all use order-0 pages today, but if they were converted, they'd want folios. So just remove the call to find_subpage() instead of replacing it with folio_page(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- mm/filemap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 120df74f3c7c..33e638f1ca34 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2208,36 +2208,35 @@ unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t index, unsigned int nr_pages, struct page **pages) { XA_STATE(xas, &mapping->i_pages, index); - struct page *page; + struct folio *folio; unsigned int ret = 0; if (unlikely(!nr_pages)) return 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; /* * If the entry has been swapped out, we can stop looking. * No current caller is looking for DAX entries. */ - if (xa_is_value(page)) + if (xa_is_value(folio)) break; - if (!page_cache_get_speculative(page)) + if (!folio_try_get_rcu(folio)) goto retry; - /* Has the page moved or been split? */ - if (unlikely(page != xas_reload(&xas))) + if (unlikely(folio != xas_reload(&xas))) goto put_page; - pages[ret] = find_subpage(page, xas.xa_index); + pages[ret] = &folio->page; if (++ret == nr_pages) break; continue; put_page: - put_page(page); + folio_put(folio); retry: xas_reset(&xas); }