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 A5C0BC6FA82 for ; Fri, 2 Sep 2022 19:47:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 10D8F800EF; Fri, 2 Sep 2022 15:47:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D4E05800EE; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81E19800EA; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) 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 4B198800EE for ; Fri, 2 Sep 2022 15:47:00 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1CA53140866 for ; Fri, 2 Sep 2022 19:47:00 +0000 (UTC) X-FDA: 79868178600.17.45D482E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id CB3811A0048 for ; Fri, 2 Sep 2022 19:46:59 +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=tM3HZb4r6eIyw+PSHEcSFNwffQ EBamlOXJODnIV9Lx7JAvX59JB9J+Ggot8hGnDYMOwZa07pj7MmHWlZ1s7UnJAsVhCCFSAccfvBvu+ faaLNYm15ryjua40sFjUQD4kyHVzTQyl0QAFhX0UfotjLLRvw0SNzSF54t66GtWy+u926VON1ZxUz K5GTs8kMQZs/kmYHC+285wB9TTFRnxgpipp5Wt7MFvAdKkBUAKZURdCFPhSKMC1hxlOdGoWRPWzWN K1AvJb2/ALxJkwVG+F6aeypfrjsCMtPwynUAZZ0pOp+/1eIEHyY+01oHJyRjQNnwCRYSti94STsWf D7a171yA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd1-007Ici-KG; Fri, 02 Sep 2022 19:46:59 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 19/57] swap: Add swap_cache_get_folio() Date: Fri, 2 Sep 2022 20:46:15 +0100 Message-Id: <20220902194653.1739778-20-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148019; 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=rhgJcuj31uIrWQ8r45V4eqAu31w20/HnVm0cDe0lN3l97zGCfW2rNS4YVtR0cNXoiHxZ0h /LKWm+DImXDvKx9wXUfwXd7dH7gDP1zPvHsruZZYpwyBU7EfqK5x9p9LyQqawoHabK+NYE TOHHkR8iZM1/G4hU3TwI2gIoJKfDv/o= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=tM3HZb4r; dmarc=none; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148019; a=rsa-sha256; cv=none; b=Ha4jZeLs8pW+MURfdNAoeVG0Dc1itylUUknp3TH4Do2bgidvuDtqJ6wXL6/rq9U6t25ebk oCSgyxsQcOXT4IUguae3PGmuOYTWNTEdM33hzAj6O2Cv2O773lmCTwXFfBiicz69nz29Ie b+Ci2kPMyzrEM2Qltbacrd+xHr8x7jM= X-Rspamd-Queue-Id: CB3811A0048 X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=tM3HZb4r; dmarc=none; 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 X-Stat-Signature: 3fxtnspfqgcozypg6gjzbhitj6mzmkqw X-Rspamd-Server: rspam05 X-HE-Tag: 1662148019-444650 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