From: Sasha Levin <sashal@kernel.org>
To: "Johannes Weiner" <hannes@cmpxchg.org>,
"Yosry Ahmed" <yosry@kernel.org>, "Nhat Pham" <nphamcs@gmail.com>,
"Tejun Heo" <tj@kernel.org>, "Michal Koutný" <mkoutny@suse.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>,
Shuah Khan <shuah@kernel.org>,
linux-mm@kvack.org, cgroups@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] selftests/cgroup: test_zswap: use the total RAM in bytes
Date: Tue, 3 Nov 2026 11:39:19 -0500 [thread overview]
Message-ID: <20261103163919.641249-1-sashal@kernel.org> (raw)
test_no_kmem_bypass() uses the totalram field of struct sysinfo as a
byte count, but it is in units of mem_unit, which can be larger than 1
on 32-bit architectures. There totalram also can't exceed GB(4), so the
size check never triggers:
test_zswap.c:609:24: warning: result of comparison of constant 4294967296 with expression of type '__kernel_ulong_t' (aka 'unsigned long') is always false [-Wtautological-constant-out-of-range-compare]
Multiply totalram by mem_unit as an unsigned long long and use that for
the check and the values derived from it. Nothing changes on 64-bit,
where mem_unit is 1.
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
Found with 32-bit builds of the selftests (gcc 16 and clang 21 with
-m32, with and without -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64);
KernelCI's 32-bit arm builds show the same warnings. The changed files
build without them now, and the x86_64 builds don't change.
tools/testing/selftests/cgroup/test_zswap.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/cgroup/test_zswap.c b/tools/testing/selftests/cgroup/test_zswap.c
index d50acc1b83ac8..223e2eb1329ab 100644
--- a/tools/testing/selftests/cgroup/test_zswap.c
+++ b/tools/testing/selftests/cgroup/test_zswap.c
@@ -597,6 +597,7 @@ static int test_no_kmem_bypass(const char *root)
size_t trigger_allocation_size;
int wait_child_iteration = 0;
long stored_pages_threshold;
+ unsigned long long totalram;
struct sysinfo sys_info;
int ret = KSFT_FAIL;
int child_status;
@@ -606,10 +607,11 @@ static int test_no_kmem_bypass(const char *root)
/* Read sys info and compute test values accordingly */
if (sysinfo(&sys_info) != 0)
return KSFT_FAIL;
- if (sys_info.totalram > GB(4)) {
+ totalram = (unsigned long long)sys_info.totalram * sys_info.mem_unit;
+ if (totalram > GB(4)) {
ksft_print_msg(
- "requires less than 4GB total ram, sys_info.totalram: %.1fGB\n",
- (double)sys_info.totalram / GB(1));
+ "requires less than 4GB total ram, total ram: %.1fGB\n",
+ (double)totalram / GB(1));
return KSFT_SKIP;
}
if (access(PATH_ZSWAP_STORED_PAGES, R_OK)) {
@@ -622,12 +624,12 @@ static int test_no_kmem_bypass(const char *root)
return KSFT_FAIL;
if (read_min_free_kb(&min_free_kb_original))
return KSFT_FAIL;
- min_free_kb_high = sys_info.totalram / 2000;
- min_free_kb_low = sys_info.totalram / 500000;
- values->target_alloc_bytes = (sys_info.totalram - min_free_kb_high * 1000) +
- sys_info.totalram * 5 / 100;
- stored_pages_threshold = sys_info.totalram / 5 / page_size;
- trigger_allocation_size = sys_info.totalram / 20;
+ min_free_kb_high = totalram / 2000;
+ min_free_kb_low = totalram / 500000;
+ values->target_alloc_bytes = (totalram - min_free_kb_high * 1000) +
+ totalram * 5 / 100;
+ stored_pages_threshold = totalram / 5 / page_size;
+ trigger_allocation_size = totalram / 20;
/* Set up test memcg */
test_group = cg_name(root, "kmem_bypass_test");
--
2.53.0
reply other threads:[~2026-11-03 16:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261103163919.641249-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=chengming.zhou@linux.dev \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mkoutny@suse.com \
--cc=nphamcs@gmail.com \
--cc=shuah@kernel.org \
--cc=tj@kernel.org \
--cc=yosry@kernel.org \
/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
all inboxes | Powered by JetHome®