From patchwork Wed Aug 30 18:50:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13370638 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 35C6BC6FA8F for ; Wed, 30 Aug 2023 18:51:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F3FC440181; Wed, 30 Aug 2023 14:50:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 17DFA440178; Wed, 30 Aug 2023 14:50:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC2F7440181; Wed, 30 Aug 2023 14:50:54 -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 CE9AB440178 for ; Wed, 30 Aug 2023 14:50:54 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AADCEB2B9F for ; Wed, 30 Aug 2023 18:50:54 +0000 (UTC) X-FDA: 81181662828.11.C566561 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id EFB5B20015 for ; Wed, 30 Aug 2023 18:50:52 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NYwRBPij; dmarc=none; spf=none (imf13.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=1693421453; 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=k6rqhfRbjD57Ec5QR1BxCnZ0WUyQvcR2ScEtufFdKsQ=; b=yiB+m7k1izPPLI4gbbqLLwaHflRdpjJBpZMrbn3A4YdfqoaQdn0ZJAAdaYo+gWKhPuZDBF GtAIZVoQljPV1IaGsC2RUWX6TUW3sLhAkw3WjUS0x6HTF64MfqvVeMwXAWRoOgpSQcdMWZ Ivn1KxlLuSC+ed7/6cgbkP5vYTzGvOM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=NYwRBPij; dmarc=none; spf=none (imf13.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=1693421453; a=rsa-sha256; cv=none; b=cgezUzBymIUl78/TI1jso4KbJKoIWO0aHkdHjxMYIP4C/BUhILe3IZ+j/ytD58xyBriqW1 lPzxYZl+02D4C9voV5NLDFM2YUr8jrRFb6WTK0DK11qUWi6FF4BV+vEw/PjpJmeGxj19xa ID8gx5vQBLQjH/1KQTosYS0wBL4US/M= 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=k6rqhfRbjD57Ec5QR1BxCnZ0WUyQvcR2ScEtufFdKsQ=; b=NYwRBPijPyuX2bSUPBgFLrE6q/ b/eVFDiBNj3PXDrVx7mIxlz2FJqsH2E4wThbAmFpYfoE5chXDBx0H7ahZMiDgHIbgOlOZnRIiksiT m0XlTeRQlEo5L1amWrMoE+kgLag/f4rSEIWZ8x8VLpW2GqqR8b2Ga3zCa7WD9nrZI+aanwuKy3c4X yjXd/WpuKNvLbHCWFyh8X8IMSC4pVfJAiueEamFtNpVRydLqL12ifM+R0fnvLwCTTH/zRIIVR9jRf 4z2pupJQMXqVOpg69LCvR3pytb9OspexFNdvfPbKZ5X/0U3WPNAaNA8FD619Hufi/UnfJDqAudM3z huo+suVQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qbQH7-00ENfY-5c; Wed, 30 Aug 2023 18:50:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Ryan Roberts Subject: [RFC PATCH 17/18] mm: Convert free_swap_cache() to take a folio Date: Wed, 30 Aug 2023 19:50:40 +0100 Message-Id: <20230830185041.3427464-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230825135918.4164671-1-willy@infradead.org> References: <20230825135918.4164671-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EFB5B20015 X-Stat-Signature: 85bohfn39s9nfyto4jjr1zwg6xsbk8px X-HE-Tag: 1693421452-146076 X-HE-Meta: U2FsdGVkX18Mj84wbixcoR7qftmGe0nBTQM+GZ0qkzOSNJB6wJ0ic4qpaZ9roGA62bO/p2toK3RTmMDnrfpbhLVPby5bhw0t0OWqztCnv4E+s1k1AvPW17LkjPsQ+yf2kxTECsdZ2xKrYLBIIbd8mHQjnZAZZNOQtyImYo8zyUqkgUpcwHVdOTFedl9KCqU35DsMi7UvOyWjkfcTM3nbRI3G3zH20qeI0Zt8v/WFcu2t9iC9Pcu/NzZyIlveOrHo5Hgh6YPqqUm2ZVNTMY1JTblTq1LPC4H2eiz9OrJPg2HE08Ytj25MQrF3bB0MhLUL6uQIHHebUWa30eo/P7V85ym2p3JhV7EeLIADB84sD9KWLx7+X7nCR3TYwI+h++l+curC09fWI/G8CVl29LEK1WmhHHOvSGRthj2Za7N+BzXJQkYwns+AjDE9XlwJnYBnP5U0EG0zWS0AOyPO7TzbQeZc7wgRa2YVxM9HDi/UEaHhu37FAdEJF9U2h9Ga6RowYywoUszv/p/rrlhprmkzc5M/UO3H6oefo6cfZmpzF2LhDjzgRH+wRqqzslacYB+dF92qEgEmOuRfBVUyZPcTBkffVnrkDAtAbGDOLGASJqbY4AcOn4pUZklG4bIv6bZ/CpSki6/0QLF9QH23n8QDkPNPo+F5naM+2lXzSaIdxE7a/223+USVUh7hbPP60guLUNAPk4sTByUPAD+ExXBJp9/3xQ7DHBHls8dUkS0RqNsQYFcpY6FDn9CE8baalYAcqF7v0Rj0/lMJfD04HNabNwEObCo8lx8px0MNDbqVJGF4xcjzdQFtpfHBAMgeerAwT7cX6HSLmMP7jaZThds7zvKSRTR4sYe7/jYUN5YxBhVETRK8IXYMvBG68k+tvG3zJBW+27z57H4YieaaF8otPudpCiqJMaVBTc9cQbIoxsiRhvXqEAi283/ov40xfCzFFk9cQA6/hBErrwCaJ6e v/2RF1m1 PQYhn/ewf8WYpjw5F8KnU3kgoxYhsgXglsWrM27aJ8YWTDNkyjcAMYEE0Q0Riwmj40zk6+Uzn98EJEFOyQKVayX3JDCRtWcsBgo5f7IHhnspGaWioabWsOMMRGriu5q+vx1/Bp4eRhmvBwGtzWQSDn/6UzdZX9aC5avLYc1vvz5nkIEFzAQhvULIFk/iY9IhvpGSNVdd2fBWtShvAXs97Tp8plrX4ke6Z9HsdwMG3eMkGNXN+OiN8Azm3EE31W3tsL05tcvjr2SQ4BH0= 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: All but one caller already has a folio, so convert free_page_and_swap_cache() to have a folio and remove the call to page_folio(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Ryan Roberts --- include/linux/swap.h | 8 ++++---- mm/khugepaged.c | 2 +- mm/memory.c | 2 +- mm/swap_state.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 493487ed7c38..3536595e3bda 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -449,9 +449,9 @@ static inline unsigned long total_swapcache_pages(void) return global_node_page_state(NR_SWAPCACHE); } -extern void free_swap_cache(struct page *page); -extern void free_page_and_swap_cache(struct page *); -extern void free_pages_and_swap_cache(struct encoded_page **, int); +void free_swap_cache(struct folio *folio); +void free_page_and_swap_cache(struct page *); +void free_pages_and_swap_cache(struct encoded_page **, int); /* linux/mm/swapfile.c */ extern atomic_long_t nr_swap_pages; extern long total_swap_pages; @@ -534,7 +534,7 @@ static inline void put_swap_device(struct swap_info_struct *si) /* used to sanity check ptes in zap_pte_range when CONFIG_SWAP=0 */ #define free_swap_and_cache(e) is_pfn_swap_entry(e) -static inline void free_swap_cache(struct page *page) +static inline void free_swap_cache(struct folio *folio) { } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index afc94c281035..7b83bb6a1199 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -725,7 +725,7 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, node_stat_sub_folio(src, NR_ISOLATED_ANON + folio_is_file_lru(src)); folio_unlock(src); - free_swap_cache(&src->page); + free_swap_cache(src); folio_putback_lru(src); } } diff --git a/mm/memory.c b/mm/memory.c index e35328c2f76e..2611d0fa4465 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3194,7 +3194,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) folio_put(new_folio); if (old_folio) { if (page_copied) - free_swap_cache(&old_folio->page); + free_swap_cache(old_folio); folio_put(old_folio); } diff --git a/mm/swap_state.c b/mm/swap_state.c index f68ddeb93698..e6b4a00d3655 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -282,10 +282,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, * folio_free_swap() _with_ the lock. * - Marcelo */ -void free_swap_cache(struct page *page) +void free_swap_cache(struct folio *folio) { - struct folio *folio = page_folio(page); - if (folio_test_swapcache(folio) && !folio_mapped(folio) && folio_trylock(folio)) { folio_free_swap(folio); @@ -299,9 +297,11 @@ void free_swap_cache(struct page *page) */ void free_page_and_swap_cache(struct page *page) { - free_swap_cache(page); + struct folio *folio = page_folio(page); + + free_swap_cache(folio); if (!is_huge_zero_page(page)) - put_page(page); + folio_put(folio); } /* @@ -316,7 +316,7 @@ void free_pages_and_swap_cache(struct encoded_page **pages, int nr) folio_batch_init(&folios); for (int i = 0; i < nr; i++) { struct folio *folio = page_folio(encoded_page_ptr(pages[i])); - free_swap_cache(&folio->page); + free_swap_cache(folio); if (folio_batch_add(&folios, folio) == 0) folios_put(&folios); }