Commit 678e54d4 authored by Chengming Zhou's avatar Chengming Zhou Committed by Andrew Morton
Browse files

mm/zswap: invalidate duplicate entry when !zswap_enabled 

We have to invalidate any duplicate entry even when !zswap_enabled since
zswap can be disabled anytime.  If the folio store success before, then
got dirtied again but zswap disabled, we won't invalidate the old
duplicate entry in the zswap_store().  So later lru writeback may
overwrite the new data in swapfile.

Link: https://lkml.kernel.org/r/20240208023254.3873823-1-chengming.zhou@linux.dev


Fixes: 42c06a0e ("mm: kill frontswap")
Signed-off-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1eb1e984

mm/zswap.c

+5 −1
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ bool zswap_store(struct folio *folio) 
	if (folio_test_large(folio))

		return false;



	if (!zswap_enabled || !tree)

	if (!tree)

		return false;



	/*
@@ -1533,6 +1533,10 @@ bool zswap_store(struct folio *folio) 
		zswap_invalidate_entry(tree, dupentry);

	}

	spin_unlock(&tree->lock);



	if (!zswap_enabled)

		return false;



	objcg = get_obj_cgroup_from_folio(folio);

	if (objcg && !obj_cgroup_may_zswap(objcg)) {

		memcg = get_mem_cgroup_from_objcg(objcg);