android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: cgroup: fix unexpected failure on test_memcg_low

Browse Source 
[ Upstream commit 19ab365762c6cc39dfdee9e13ab0d12fe4b5540d ]

Since commit f079a020ba ("selftests: memcg: factor out common parts of
memory.{low,min} tests"), the value used in second alloc_anon has changed
from 148M to 170M.  Because memory.low allows reclaiming page cache in
child cgroups, so the memory.current is close to 30M instead of 50M.
Therefore, adjust the expected value of parent cgroup.

Link: https://lkml.kernel.org/r/20230522095233.4246-2-haifeng.xu@shopee.com
Fixes: f079a020ba ("selftests: memcg: factor out common parts of memory.{low,min} tests")
Signed-off-by: Haifeng Xu <haifeng.xu@shopee.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Haifeng Xu 2023-05-22 09:52:33 +00:00 committed by Greg Kroah-Hartman
parent 75704a10ea
commit b27af27fc9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/cgroup/test_memcontrol.c
View File

@ -284,6 +284,7 @@ static int test_memcg_protection(const char *root, bool min)
char *children[4] = {NULL}; char *children[4] = {NULL};
const char *attribute = min ? "memory.min" : "memory.low"; const char *attribute = min ? "memory.min" : "memory.low";
long c[4]; long c[4];
long current;
int i, attempts; int i, attempts;
int fd; int fd;
@ -392,7 +393,8 @@ static int test_memcg_protection(const char *root, bool min)
goto cleanup; goto cleanup;
} }
if (!values_close(cg_read_long(parent[1], "memory.current"), MB(50), 3)) current = min ? MB(50) : MB(30);
if (!values_close(cg_read_long(parent[1], "memory.current"), current, 3))
goto cleanup; goto cleanup;
if (min) { if (min) {