public inbox for linux-mm@kvack.org
 help / color / mirror / Atom feed
* [PATCH v2 1/7] selftests/cgroup: skip test_zswap if zswap is globally disabled
@ 2026-03-12  4:06 Li Wang
  2026-03-12  4:06 ` [PATCH v2 2/7] selftests/cgroup: avoid OOM in test_swapin_nozswap Li Wang
                   ` (6 more replies)
  0 siblings, 7 replies; 17+ messages in thread
From: Li Wang @ 2026-03-12  4:06 UTC (permalink / raw)
  To: mkoutny, yosryahmed
  Cc: linux-kselftest, linux-kernel, linux-mm, Johannes Weiner,
	Michal Hocko, Muchun Song, Nhat Pham, Tejun Heo, Roman Gushchin,
	Shakeel Butt

Currently, test_zswap only checks for the presence of zswap via
/sys/module/zswap, but it does not account for the global runtime
state in /sys/module/zswap/parameters/enabled.

If zswap is configured in the kernel but globally disabled at runtime,
the zswap cgroup tests will run in an invalid environment and fail
spuriously.

Fix this by reading the 'enabled' parameter and gracefully skipping
the test when zswap is disabled. A helpful hint is also added to the
skip message to show users how to enable it.

Signed-off-by: Li Wang <liwang@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Yosry Ahmed <yosryahmed@google.com>
---

Notes:
    v1 --> v2:
        * remove enable/disable_zswap functions
        * skip the test if zswap is not enabled
        * reporting fail when zswap_enabled return -1

 tools/testing/selftests/cgroup/test_zswap.c | 28 +++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c
index 64ebc3f3f203..ec64daaa2f5a 100644
--- a/tools/testing/selftests/cgroup/test_zswap.c
+++ b/tools/testing/selftests/cgroup/test_zswap.c
@@ -589,23 +589,41 @@ struct zswap_test {
 };
 #undef T
 
-static bool zswap_configured(void)
+static int zswap_enabled(void)
 {
-	return access("/sys/module/zswap", F_OK) == 0;
+	char buf[16];
+	ssize_t n;
+
+	if (access("/sys/module/zswap", F_OK))
+		ksft_exit_skip("zswap isn't configured\n");
+
+	n = read_text("/sys/module/zswap/parameters/enabled", buf, sizeof(buf));
+	if (n <= 0)
+		return -1;
+
+	if (buf[0] == 'Y')
+		return 1;
+	else if (buf[0] == 'N')
+		return 0;
+
+	return -1;
 }
 
 int main(int argc, char **argv)
 {
 	char root[PATH_MAX];
-	int i;
+	int i, state;
 
 	ksft_print_header();
 	ksft_set_plan(ARRAY_SIZE(tests));
 	if (cg_find_unified_root(root, sizeof(root), NULL))
 		ksft_exit_skip("cgroup v2 isn't mounted\n");
 
-	if (!zswap_configured())
-		ksft_exit_skip("zswap isn't configured\n");
+	state = zswap_enabled();
+	if (state == 0)
+		ksft_exit_skip("zswap is disabled (hint: echo 1 > /sys/module/zswap/parameters/enabled)\n");
+	else if (state < 0)
+		ksft_exit_fail_msg("Failed to read zswap state\n");
 
 	/*
 	 * Check that memory controller is available:
-- 
2.53.0



^ permalink raw reply related	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2026-03-13  3:35 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-12  4:06 [PATCH v2 1/7] selftests/cgroup: skip test_zswap if zswap is globally disabled Li Wang
2026-03-12  4:06 ` [PATCH v2 2/7] selftests/cgroup: avoid OOM in test_swapin_nozswap Li Wang
2026-03-12 22:41   ` Yosry Ahmed
2026-03-12  4:06 ` [PATCH v2 3/7] selftests/cgroup: use runtime page size for zswpin check Li Wang
2026-03-12  4:06 ` [PATCH v2 4/7] selftests/cgroup: rename PAGE_SIZE to BUF_SIZE in cgroup_util Li Wang
2026-03-12  4:06 ` [PATCH v2 5/7] selftest/cgroup: fix zswap test_no_invasive_cgroup_shrink on 64K pagesize system Li Wang
2026-03-12  4:06 ` [PATCH v2 6/7] selftests/cgroup: replace hardcoded page size values in test_zswap Li Wang
2026-03-12 22:44   ` Yosry Ahmed
2026-03-13  2:01     ` Li Wang
2026-03-12  4:06 ` [PATCH v2 7/7] selftest/cgroup: fix zswap attempt_writeback() on 64K pagesize system Li Wang
2026-03-12 22:44   ` Yosry Ahmed
2026-03-12 18:32 ` [PATCH v2 1/7] selftests/cgroup: skip test_zswap if zswap is globally disabled Nhat Pham
2026-03-12 21:09   ` Yosry Ahmed
2026-03-13  1:50     ` Li Wang
2026-03-13  2:58       ` Yosry Ahmed
2026-03-13  3:23         ` Li Wang
2026-03-13  3:35           ` Li Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox