From: Li Wang <liwang@redhat.com>
To: mkoutny@suse.com, yosryahmed@google.com
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, Yosry Ahmed <yosry@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Muchun Song <muchun.song@linux.dev>,
Nhat Pham <nphamcs@gmail.com>, Tejun Heo <tj@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeel.butt@linux.dev>
Subject: [PATCH v2 3/7] selftests/cgroup: use runtime page size for zswpin check
Date: Thu, 12 Mar 2026 12:06:23 +0800 [thread overview]
Message-ID: <20260312040627.55257-3-liwang@redhat.com> (raw)
In-Reply-To: <20260312040627.55257-1-liwang@redhat.com>
test_zswapin compares memory.stat:zswpin (counted in pages) against a
byte threshold converted with PAGE_SIZE. In cgroup selftests, PAGE_SIZE
is hardcoded to 4096, which makes the conversion wrong on systems with
non-4K base pages (e.g. 64K).
As a result, the test requires too many pages to pass and fails
spuriously even when zswap is working.
Use sysconf(_SC_PAGESIZE) for the zswpin threshold conversion so the
check matches the actual system page size.
Signed-off-by: Li Wang <liwang@redhat.com>
Reviewed-by: Yosry Ahmed <yosry@kernel.org>
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>
---
tools/testing/selftests/cgroup/test_zswap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c
index 8bf5fc34bb23..032c36658a15 100644
--- a/tools/testing/selftests/cgroup/test_zswap.c
+++ b/tools/testing/selftests/cgroup/test_zswap.c
@@ -235,7 +235,7 @@ static int test_zswapin(const char *root)
goto out;
}
- if (zswpin < MB(24) / PAGE_SIZE) {
+ if (zswpin < MB(24) / sysconf(_SC_PAGESIZE)) {
ksft_print_msg("at least 24MB should be brought back from zswap\n");
goto out;
}
--
2.53.0
next prev parent reply other threads:[~2026-03-12 4:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Li Wang [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260312040627.55257-3-liwang@redhat.com \
--to=liwang@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mkoutny@suse.com \
--cc=muchun.song@linux.dev \
--cc=nphamcs@gmail.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeel.butt@linux.dev \
--cc=tj@kernel.org \
--cc=yosry@kernel.org \
--cc=yosryahmed@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox