From nobody Sun Feb 8 11:59:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9AD7EB64DC for ; Sat, 15 Jul 2023 04:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230505AbjGOEYW (ORCPT ); Sat, 15 Jul 2023 00:24:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230389AbjGOEYP (ORCPT ); Sat, 15 Jul 2023 00:24:15 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A42B13AB7 for ; Fri, 14 Jul 2023 21:24:06 -0700 (PDT) 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=EduZ7W0Le6I35LYB/u+YcVvsoSvotZ94k7H+d8Z5G54=; b=MLPY15+33nuOpVVoVVRORpp6nI B/2U1S0zN4gQDRRyF+TgPm/ye6qNmKTmUuBjdlI85g70rDYYLl3wpIXeJ1w8A6iUGsGwLcd3iWRjT zInEVcnDaflgUwfAOt/su4CbibIVXpgzO+dj/HHhsqU1P3IIRaW4P7dsE4QKSsLqO6Z5mcMFmSFvO ljBj8CiLgN1MYIu3xDFDnuCRCFSotXCiHiKZsatJ85Ev1IcZf4YTiuuksfEXUC7qPbieXKqY3JRqV N/UzhHm4NXg1D/1kAewieLPSG58JipVtcLTXMn6Psdx4SAvEQjzsGCe55itdzotsD6bmw9e4fXlCG 7rMY+5zw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3o-B3; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 1/5] fix-frontswap Date: Sat, 15 Jul 2023 05:23:39 +0100 Message-Id: <20230715042343.434588-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" --- mm/zswap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/zswap.c b/mm/zswap.c index 1b0128060792..f6a78e085479 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -26,6 +26,7 @@ #include #include #include +#include #include =20 #include --=20 2.39.2 From nobody Sun Feb 8 11:59:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 057C0EB64DC for ; Sat, 15 Jul 2023 04:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230174AbjGOEX4 (ORCPT ); Sat, 15 Jul 2023 00:23:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjGOEXy (ORCPT ); Sat, 15 Jul 2023 00:23:54 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95D1635A9 for ; Fri, 14 Jul 2023 21:23:52 -0700 (PDT) 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=aZOTevyyG/oq7Dcb/mDg4h3vECd5Czx9C+nnro/i/yI=; b=PrC2Q5i1RZUQ3NoWBymN8xdsDw VN9bzJ75Grrvkb2F/xMhSInJJKrjHYSrDiJu9Xz/AD/RyXELC58gEjFJHB7ADGAX8Tnys8yOuV2bM rfGZ4Lxfxnvu/yaz+Gx5bDS54gJNSJ1nA/CirJF8hbPtLQY4p3WMbWLdnOssESTuhpz5rCCKPj46f yu9xO+DnTP0rAlinUHRpeJ102wP6g7teVzOnYWub18YqnzON7d4UeG1hqCCuU5vuAZZyIy97m2TP9 XbUwm9tLEeZywDy7frHNsQXCf/HZi8bjPWB2O1fMmqwoGpZNoJ8u6m17dNfXibTmPDs85K7YUopTG QAzbF+Kw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3q-EK; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 2/5] zswap: Make zswap_store() take a folio Date: Sat, 15 Jul 2023 05:23:40 +0100 Message-Id: <20230715042343.434588-3-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Only convert a few easy parts of this function to use the folio passed in; convert back to struct page for the majority of it. This does remove a few hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/zswap.h | 4 ++-- mm/page_io.c | 2 +- mm/zswap.c | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 850c377d9b6d..9f318c8bc367 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -10,7 +10,7 @@ extern atomic_t zswap_stored_pages; =20 #ifdef CONFIG_ZSWAP =20 -bool zswap_store(struct page *page); +bool zswap_store(struct folio *folio); bool zswap_load(struct page *page); void zswap_invalidate(int type, pgoff_t offset); void zswap_swapon(int type); @@ -18,7 +18,7 @@ void zswap_swapoff(int type); =20 #else =20 -static inline bool zswap_store(struct page *page) +static inline bool zswap_store(struct folio *folio) { return false; } diff --git a/mm/page_io.c b/mm/page_io.c index 32afc2a52982..b9fda7fb4e75 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -198,7 +198,7 @@ int swap_writepage(struct page *page, struct writeback_= control *wbc) folio_unlock(folio); return ret; } - if (zswap_store(&folio->page)) { + if (zswap_store(folio)) { folio_start_writeback(folio); folio_unlock(folio); folio_end_writeback(folio); diff --git a/mm/zswap.c b/mm/zswap.c index f6a78e085479..ba50b186ee27 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1201,11 +1201,12 @@ static void zswap_fill_page(void *ptr, unsigned lon= g value) memset_l(page, value, PAGE_SIZE / sizeof(unsigned long)); } =20 -bool zswap_store(struct page *page) +bool zswap_store(struct folio *folio) { - swp_entry_t swp =3D { .val =3D page_private(page), }; + swp_entry_t swp =3D folio_swap_entry(folio); int type =3D swp_type(swp); pgoff_t offset =3D swp_offset(swp); + struct page *page =3D &folio->page; struct zswap_tree *tree =3D zswap_trees[type]; struct zswap_entry *entry, *dupentry; struct scatterlist input, output; @@ -1219,11 +1220,11 @@ bool zswap_store(struct page *page) gfp_t gfp; int ret; =20 - VM_WARN_ON_ONCE(!PageLocked(page)); - VM_WARN_ON_ONCE(!PageSwapCache(page)); + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); =20 - /* THP isn't supported */ - if (PageTransHuge(page)) + /* Large folios aren't supported */ + if (folio_test_large(folio)) return false; =20 if (!zswap_enabled || !tree) --=20 2.39.2 From nobody Sun Feb 8 11:59:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF9AAEB64DC for ; Sat, 15 Jul 2023 04:24:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229601AbjGOEYG (ORCPT ); Sat, 15 Jul 2023 00:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230358AbjGOEYB (ORCPT ); Sat, 15 Jul 2023 00:24:01 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0582735AB for ; Fri, 14 Jul 2023 21:24:00 -0700 (PDT) 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=7FLmcjaPLpEGscatrzN5qp/wg/vDvmkauQ9Fg4Em8sE=; b=iY960qup3GgE02Qc8hTQi0rsqK 1ig2TdspYQRUVHvoQt0nYZglzQb8SzK09LJYGooF+YhYJNMDQfkdNavbCcUqjtON2iqPn2rTz8wvB 7KuwGjoADJqAgCESw9WNyWlZIgqcucnRFkF9WP9FiDf4+JvcqeDxSDFmo7AC3nsFFvRkrzZONP3// KTyRt7nwOQkqoKa1gdOzKn7fWbA15RC45913fcCB6Rm2VvPZzeoyj2Zw6Ao44b2+uHnoijdO9txwe uSbSfquHsw7enKXdBl8oSCYKtQFN5vU2Ve9v1r3lr+yC+tFwCpMLrh4Lia4dF0C1WlSJJY7Ep1D5w 8PnT856A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3s-GU; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 3/5] memcg: Convert get_obj_cgroup_from_page to get_obj_cgroup_from_folio Date: Sat, 15 Jul 2023 05:23:41 +0100 Message-Id: <20230715042343.434588-4-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As the one caller now has a folio, pass it in and use it. Removes three calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 4 ++-- mm/memcontrol.c | 8 ++++---- mm/zswap.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5818af8eca5a..7b676752f474 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1761,7 +1761,7 @@ int __memcg_kmem_charge_page(struct page *page, gfp_t= gfp, int order); void __memcg_kmem_uncharge_page(struct page *page, int order); =20 struct obj_cgroup *get_obj_cgroup_from_current(void); -struct obj_cgroup *get_obj_cgroup_from_page(struct page *page); +struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio); =20 int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size); void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size); @@ -1845,7 +1845,7 @@ static inline void __memcg_kmem_uncharge_page(struct = page *page, int order) { } =20 -static inline struct obj_cgroup *get_obj_cgroup_from_page(struct page *pag= e) +static inline struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *f= olio) { return NULL; } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e8ca4bdcb03c..acc9acb0c9a1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3036,21 +3036,21 @@ __always_inline struct obj_cgroup *get_obj_cgroup_f= rom_current(void) return objcg; } =20 -struct obj_cgroup *get_obj_cgroup_from_page(struct page *page) +struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio) { struct obj_cgroup *objcg; =20 if (!memcg_kmem_online()) return NULL; =20 - if (PageMemcgKmem(page)) { - objcg =3D __folio_objcg(page_folio(page)); + if (folio_memcg_kmem(folio)) { + objcg =3D __folio_objcg(folio); obj_cgroup_get(objcg); } else { struct mem_cgroup *memcg; =20 rcu_read_lock(); - memcg =3D __folio_memcg(page_folio(page)); + memcg =3D __folio_memcg(folio); if (memcg) objcg =3D __get_obj_cgroup_from_memcg(memcg); else diff --git a/mm/zswap.c b/mm/zswap.c index ba50b186ee27..69d097d14255 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1235,7 +1235,7 @@ bool zswap_store(struct folio *folio) * cgroup-aware entry LRU, we will push out entries system-wide based on * local cgroup limits. */ - objcg =3D get_obj_cgroup_from_page(page); + objcg =3D get_obj_cgroup_from_folio(folio); if (objcg && !obj_cgroup_may_zswap(objcg)) goto reject; =20 --=20 2.39.2 From nobody Sun Feb 8 11:59:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20F0FC001B0 for ; Sat, 15 Jul 2023 04:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230387AbjGOEYD (ORCPT ); Sat, 15 Jul 2023 00:24:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbjGOEX6 (ORCPT ); Sat, 15 Jul 2023 00:23:58 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12E4835A9 for ; Fri, 14 Jul 2023 21:23:57 -0700 (PDT) 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=KykWwNFW2V5pOcZKvJr7OCs/yVc8LncYJ9HLsA6CPzQ=; b=jimt36fM3V2iDkBnN5O5trWSrN FlJBU1FP9iOdaPzGGDEwRK0PQkIz+abiL64QteduGF4avMCfp/sqSib/NlWF1uIEUt/IO1EvMFhW8 AZN/J89Ziu1jEY6N+WGhB2NKc7yI/U1k5bkfFpGbGaVGHVnDBKuIkPggMndS8IJ0zV+meTRlIsyk6 Sb+YVmtMbBk7CEF9Bhl5ErBDCP8IB0fkHQ0wK7q9TxU+yKgtSHi4djyP5TITP9aaY3An8fbZja4tw GqP8YcETFt2VMwO64AwsUDCF9R+HhaJCX6t08E5D12BU9qrlv98oNS2nymFr0bWg8gX8NRenLOcir TC8VPDyQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3u-Ii; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 4/5] swap: Remove some calls to compound_head() in swap_readpage() Date: Sat, 15 Jul 2023 05:23:42 +0100 Message-Id: <20230715042343.434588-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Replace six implicit calls to compound_head() with one call to page_folio(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_io.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index b9fda7fb4e75..e5b6f1402506 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -495,14 +495,15 @@ static void swap_readpage_bdev_async(struct page *pag= e, =20 void swap_readpage(struct page *page, bool synchronous, struct swap_iocb *= *plug) { + struct folio *folio =3D page_folio(page); struct swap_info_struct *sis =3D page_swap_info(page); - bool workingset =3D PageWorkingset(page); + bool workingset =3D folio_test_workingset(folio); unsigned long pflags; bool in_thrashing; =20 - VM_BUG_ON_PAGE(!PageSwapCache(page) && !synchronous, page); - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(PageUptodate(page), page); + VM_BUG_ON_FOLIO(!folio_test_swapcache(folio) && !synchronous, folio); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + VM_BUG_ON_FOLIO(folio_test_uptodate(folio), folio); =20 /* * Count submission time as memory stall and delay. When the device @@ -516,8 +517,8 @@ void swap_readpage(struct page *page, bool synchronous,= struct swap_iocb **plug) delayacct_swapin_start(); =20 if (zswap_load(page)) { - SetPageUptodate(page); - unlock_page(page); + folio_mark_uptodate(folio); + folio_unlock(folio); } else if (data_race(sis->flags & SWP_FS_OPS)) { swap_readpage_fs(page, plug); } else if (synchronous || (sis->flags & SWP_SYNCHRONOUS_IO)) { --=20 2.39.2 From nobody Sun Feb 8 11:59:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C278EB64DC for ; Sat, 15 Jul 2023 04:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230356AbjGOEX6 (ORCPT ); Sat, 15 Jul 2023 00:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229926AbjGOEXy (ORCPT ); Sat, 15 Jul 2023 00:23:54 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19F9335AC for ; Fri, 14 Jul 2023 21:23:54 -0700 (PDT) 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=fL+qL8EnlaO5FW8JSNM7sOc38PnS7TUvxqQRKH9FEK4=; b=KdxGJ59ODR0MgZlSXyaTqvQyF4 7ewg/KBwST6gTXXAsH7ACpre9ad3A+U7bgyBk0hqzsfD3VHiM0rxdlQ0W2ZFd8YXWw754UwlITjQh BtNGe0HFIwa1zZp4FyAYu4hp9pIetp7C8cpc06hqhkZFKpFVOK4AOjJow3Fi6Xg+ZJmHmVyX4fjfq 3bjbYTtej6eqoovTtbe2+nVLe/BpyCB0xFZZfrASsxtvYEykZ1yA6j9Jy0MXdsa+4RTJDJ8ADJll7 qv65m2Ja06vW2zHDiMkywAX9xLFCa+dtKnaZXFpi5Ah+Gq5Wrx0qfdn7vJqjgDCGgsflhigwNPXMc 3owfFJdg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qKWos-001p3w-LO; Sat, 15 Jul 2023 04:23:46 +0000 From: "Matthew Wilcox (Oracle)" To: Johannes Weiner Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, vitaly.wool@konsulko.com, cerasuolodomenico@gmail.com, nphamcs@gmail.com, hch@infradead.org, yosryahmed@google.com, akpm@linux-foundation.org Subject: [PATCH 5/5] zswap: Make zswap_load() take a folio Date: Sat, 15 Jul 2023 05:23:43 +0100 Message-Id: <20230715042343.434588-6-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230715042343.434588-1-willy@infradead.org> References: <20230714194610.828210-1-hannes@cmpxchg.org> <20230715042343.434588-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Only convert a few easy parts of this function to use the folio passed in; convert back to struct page for the majority of it. Removes three hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/zswap.h | 4 ++-- mm/page_io.c | 2 +- mm/zswap.c | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index 9f318c8bc367..2a60ce39cfde 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -11,7 +11,7 @@ extern atomic_t zswap_stored_pages; #ifdef CONFIG_ZSWAP =20 bool zswap_store(struct folio *folio); -bool zswap_load(struct page *page); +bool zswap_load(struct folio *folio); void zswap_invalidate(int type, pgoff_t offset); void zswap_swapon(int type); void zswap_swapoff(int type); @@ -23,7 +23,7 @@ static inline bool zswap_store(struct folio *folio) return false; } =20 -static inline bool zswap_load(struct page *page) +static inline bool zswap_load(struct folio *folio) { return false; } diff --git a/mm/page_io.c b/mm/page_io.c index e5b6f1402506..8741d3a0d48a 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -516,7 +516,7 @@ void swap_readpage(struct page *page, bool synchronous,= struct swap_iocb **plug) } delayacct_swapin_start(); =20 - if (zswap_load(page)) { + if (zswap_load(folio)) { folio_mark_uptodate(folio); folio_unlock(folio); } else if (data_race(sis->flags & SWP_FS_OPS)) { diff --git a/mm/zswap.c b/mm/zswap.c index 69d097d14255..4287f8551841 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1381,11 +1381,12 @@ bool zswap_store(struct folio *folio) goto reject; } =20 -bool zswap_load(struct page *page) +bool zswap_load(struct folio *folio) { - swp_entry_t swp =3D { .val =3D page_private(page), }; + swp_entry_t swp =3D folio_swap_entry(folio); int type =3D swp_type(swp); pgoff_t offset =3D swp_offset(swp); + struct page *page =3D &folio->page; struct zswap_tree *tree =3D zswap_trees[type]; struct zswap_entry *entry; struct scatterlist input, output; @@ -1394,8 +1395,8 @@ bool zswap_load(struct page *page) unsigned int dlen; bool ret; =20 - VM_WARN_ON_ONCE(!PageLocked(page)); - VM_WARN_ON_ONCE(!PageSwapCache(page)); + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + VM_WARN_ON_ONCE(!folio_test_swapcache(folio)); =20 /* find */ spin_lock(&tree->lock); @@ -1457,7 +1458,7 @@ bool zswap_load(struct page *page) spin_lock(&tree->lock); if (ret && zswap_exclusive_loads_enabled) { zswap_invalidate_entry(tree, entry); - SetPageDirty(page); + folio_mark_dirty(folio); } else if (entry->length) { spin_lock(&entry->pool->lru_lock); list_move(&entry->lru, &entry->pool->lru); --=20 2.39.2