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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 485ECC25B08 for ; Mon, 8 Aug 2022 19:35:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D20F940013; Mon, 8 Aug 2022 15:35:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 459AC940007; Mon, 8 Aug 2022 15:35:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D448940013; Mon, 8 Aug 2022 15:35:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 12563940007 for ; Mon, 8 Aug 2022 15:35:22 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DDF06C02CA for ; Mon, 8 Aug 2022 19:35:21 +0000 (UTC) X-FDA: 79777429242.15.8F192CA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 8FC5F120156 for ; Mon, 8 Aug 2022 19:35:21 +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=LV3i0kkJqsfpyICvVTbaOoAHHMn/zS4yYuJXoR6jl3w=; b=qb3aalkjk7ODd9Iawlzw+ph270 fGFsa7NqGAQv22X/lavHDC21wQwXuLkbupnvs5tVElSBTJuU8B1v+dQgvVrf8IzrQewo2vbQ7RoSo Slvd2kohH6MNGYlu/Fn+ytVJ6++zDGJInr342r+sjTd2RAsHf59CCsH4yEwU+CTTszVkrR+CaPOrr DWvc7sBuxqGr7FM4BA7PNapEUVQmL1pI6da+HCYwl25sIXsyaSacMow5qPQxW10qOpYdzm7HOsFBs o1ac4Jd/YNHXxVl2DDVzvlvaUANXvhD7d/FHWTt1VQMeV1XpGianQRaBoYyuBqJjB5WfF8YRpzgjk 7bY7D1YQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8Wz-00EAwe-K7; Mon, 08 Aug 2022 19:35:17 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 22/59] swap: Add swap_cache_get_folio() Date: Mon, 8 Aug 2022 20:33:50 +0100 Message-Id: <20220808193430.3378317-23-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987321; a=rsa-sha256; cv=none; b=kJTXh6sbMRyydNs3gxO9nXjQSCcy7uFV4V6CjNJwhC4kT5YortWe5H9Kd92HZd+5uGhGFr lPz8/yvqjucQIYPVDb5hrWcmADsdR/34r6GmlJqY88qceCMchFBhkqQbPgWGALLdp1aJEH dSGxFS4dA24MYvohJl08hq4Lqsm2UHc= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qb3aalkj; dmarc=none; spf=none (imf29.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=1659987321; 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=LV3i0kkJqsfpyICvVTbaOoAHHMn/zS4yYuJXoR6jl3w=; b=D0xfa7ODpE7ojc8U7ZZOMwT1lQ6tm1bEL7/krE8QAXe3GT+F3vJPP29HZ3XEbOJ62nwavO j16Lxmw2euhZOVjhLOScEIWAUNmaZLY+RHkfrEjPZ8MsHycfP00N+5iEOzBtf6rgXoQrOc XidGc6kgPaMHMI9xEWJ7rophwsVeLCM= X-Rspamd-Server: rspam10 X-Stat-Signature: gwrw456rg9qkmpynot9e3nt6qidespep Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qb3aalkj; dmarc=none; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Queue-Id: 8FC5F120156 X-HE-Tag: 1659987321-793174 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: Convert lookup_swap_cache() into swap_cache_get_folio() and add a lookup_swap_cache() wrapper around it. Signed-off-by: Matthew Wilcox (Oracle) --- mm/swap.h | 2 ++ mm/swap_state.c | 32 +++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/mm/swap.h b/mm/swap.h index 0e023765e110..f70ff34dab82 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -41,6 +41,8 @@ void __delete_from_swap_cache(struct folio *folio, void delete_from_swap_cache(struct folio *folio); void clear_shadow_from_swap_cache(int type, unsigned long begin, unsigned long end); +struct folio *swap_cache_get_folio(swp_entry_t entry, + struct vm_area_struct *vma, unsigned long addr); struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, unsigned long addr); diff --git a/mm/swap_state.c b/mm/swap_state.c index a7e0438902dd..b96bf4ec8b5b 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -317,24 +317,24 @@ static inline bool swap_use_vma_readahead(void) } /* - * Lookup a swap entry in the swap cache. A found page will be returned + * Lookup a swap entry in the swap cache. A found folio will be returned * unlocked and with its refcount incremented - we rely on the kernel - * lock getting page table operations atomic even if we drop the page + * lock getting page table operations atomic even if we drop the folio * lock before returning. */ -struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, - unsigned long addr) +struct folio *swap_cache_get_folio(swp_entry_t entry, + struct vm_area_struct *vma, unsigned long addr) { - struct page *page; + struct folio *folio; struct swap_info_struct *si; si = get_swap_device(entry); if (!si) return NULL; - page = find_get_page(swap_address_space(entry), swp_offset(entry)); + folio = filemap_get_folio(swap_address_space(entry), swp_offset(entry)); put_swap_device(si); - if (page) { + if (folio) { bool vma_ra = swap_use_vma_readahead(); bool readahead; @@ -342,10 +342,10 @@ struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, * At the moment, we don't support PG_readahead for anon THP * so let's bail out rather than confusing the readahead stat. */ - if (unlikely(PageTransCompound(page))) - return page; + if (unlikely(folio_test_large(folio))) + return folio; - readahead = TestClearPageReadahead(page); + readahead = folio_test_clear_readahead(folio); if (vma && vma_ra) { unsigned long ra_val; int win, hits; @@ -366,7 +366,17 @@ struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, } } - return page; + return folio; +} + +struct page *lookup_swap_cache(swp_entry_t entry, struct vm_area_struct *vma, + unsigned long addr) +{ + struct folio *folio = swap_cache_get_folio(entry, vma, addr); + + if (!folio) + return NULL; + return folio_file_page(folio, swp_offset(entry)); } /** -- 2.35.1