[merged mm-stable] mm-zswap-skip-xarray-walk-in-zswap_invalidate-when-zswap-is-unused.patch removed from -mm tree

[merged mm-stable] mm-zswap-skip-xarray-walk-in-zswap_invalidate-when-zswap-is-unused.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm: zswap: skip xarray walk in zswap_invalidate() when zswap is unused
has been removed from the -mm tree.  Its filename was
     mm-zswap-skip-xarray-walk-in-zswap_invalidate-when-zswap-is-unused.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: mm: zswap: skip xarray walk in zswap_invalidate() when zswap is unused
Date: Thu, 10 Sep 2026 20:35:43 +0800

zswap_invalidate() still walks the per-area xarray even when zswap has
never been enabled.  Add a zswap_never_enabled() to skip it.

Link: https://lore.kernel.org/20260910123544.818146-3-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Yosry Ahmed <yosry@kernel.org>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Kairui Song <kasong@tencent.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
---

 mm/zswap.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/mm/zswap.c~mm-zswap-skip-xarray-walk-in-zswap_invalidate-when-zswap-is-unused
+++ a/mm/zswap.c
@@ -1667,6 +1667,9 @@ void zswap_invalidate(int type, pgoff_t
 	struct xarray *tree;
 	unsigned long i;
 
+	if (zswap_never_enabled())
+		return;
+
 	for (i = 0; i < nr_entries; i++) {
 		tree = zswap_tree(type, offset + i);
 
_

Patches currently in -mm which might be from wangkefeng.wang@huawei.com are

mm-mincore-use-per-vma-lock-during-page-table-walk.patch