[LTP] [PATCH v3] memcg/functional: fix memcg_failcnt intermittent timeout by disabling swap
Xuewen Wang <[email protected]>
| Newsgroups | it.linux.lists.ltp |
|---|---|
| Message-ID | <[email protected]> |
memcg_failcnt.sh tests the memory.failcnt counter by allocating reclaimable memory (mmap-anon/mmap-file/shm) beyond a tiny cgroup limit (1 page). It relies on the process being OOM-killed so that signal_memcg_process()'s wait loop exits. With swap enabled the kernel usually still OOM-kills the process, but on arm64 reclaim (swap out) sometimes succeeds instead: usage_in_bytes stays at the limit and the process keeps running, so the wait loop times out (TBROK) intermittently. Example failure on arm64 (kernel 6.6): memcg_failcnt 2 TBROK: timed out on memory.usage_in_bytes 4096 0 8192 Disable swap around the allocation and re-enable it afterwards, mirroring what memcg_limit_in_bytes.sh already does for the same reclaimable memory types. Signed-off-by: Xuewen Wang <[email protected]> --- Changes in v2: - Drop "2>/dev/null" from swapoff/swapon so that a failure to disable swap (or a missing swapoff binary) stays visible, instead of silently letting the intermittent timeout recur. Per the LTP AI review, the redirect hid the very error this fix relies on, and memcg_limit_in_bytes.sh does not redirect stderr either. Changes in v3: - Move swapoff to do_setup() and swapon to do_cleanup() per Li Wang, instead of wrapping each test iteration with swapoff/swapon in do_test(). --- .../controllers/memcg/functional/memcg_failcnt.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh index 3a02d16c2..93e8d4838 100755 --- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh +++ b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh @@ -11,6 +11,20 @@ MEMCG_TESTFUNC=do_test MEMCG_SHMMAX=1 TST_TEST_DATA="--mmap-anon --mmap-file --shm" +TST_SETUP=do_setup +TST_CLEANUP=do_cleanup + +do_setup() +{ + memcg_setup + swapoff -a +} + +do_cleanup() +{ + swapon -a + memcg_cleanup +} do_test() { -- 2.25.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp