Commit 6a359190 authored by Michal Koutný's avatar Michal Koutný Committed by akpm

selftests: memcg: remove protection from top level memcg

The reclaim is triggered by memory limit in a subtree, therefore the
testcase does not need configured protection against external reclaim.

Also, correct respective comments.

Link: https://lkml.kernel.org/r/20220518161859.21565-5-mkoutny@suse.comSigned-off-by: default avatarMichal Koutný <mkoutny@suse.com>
Acked-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Cc: David Vernet <void@manifault.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Richard Palethorpe <rpalethorpe@suse.de>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f10b6e9a
...@@ -247,7 +247,7 @@ static int cg_test_proc_killed(const char *cgroup) ...@@ -247,7 +247,7 @@ static int cg_test_proc_killed(const char *cgroup)
/* /*
* First, this test creates the following hierarchy: * First, this test creates the following hierarchy:
* A memory.min = 50M, memory.max = 200M * A memory.min = 0, memory.max = 200M
* A/B memory.min = 50M * A/B memory.min = 50M
* A/B/C memory.min = 75M, memory.current = 50M * A/B/C memory.min = 75M, memory.current = 50M
* A/B/D memory.min = 25M, memory.current = 50M * A/B/D memory.min = 25M, memory.current = 50M
...@@ -257,7 +257,7 @@ static int cg_test_proc_killed(const char *cgroup) ...@@ -257,7 +257,7 @@ static int cg_test_proc_killed(const char *cgroup)
* Usages are pagecache, but the test keeps a running * Usages are pagecache, but the test keeps a running
* process in every leaf cgroup. * process in every leaf cgroup.
* Then it creates A/G and creates a significant * Then it creates A/G and creates a significant
* memory pressure in it. * memory pressure in A.
* *
* Then it checks actual memory usages and expects that: * Then it checks actual memory usages and expects that:
* A/B memory.current ~= 50M * A/B memory.current ~= 50M
...@@ -338,8 +338,6 @@ static int test_memcg_min(const char *root) ...@@ -338,8 +338,6 @@ static int test_memcg_min(const char *root)
(void *)(long)fd); (void *)(long)fd);
} }
if (cg_write(parent[0], "memory.min", "50M"))
goto cleanup;
if (cg_write(parent[1], "memory.min", "50M")) if (cg_write(parent[1], "memory.min", "50M"))
goto cleanup; goto cleanup;
if (cg_write(children[0], "memory.min", "75M")) if (cg_write(children[0], "memory.min", "75M"))
...@@ -407,7 +405,7 @@ static int test_memcg_min(const char *root) ...@@ -407,7 +405,7 @@ static int test_memcg_min(const char *root)
/* /*
* First, this test creates the following hierarchy: * First, this test creates the following hierarchy:
* A memory.low = 50M, memory.max = 200M * A memory.low = 0, memory.max = 200M
* A/B memory.low = 50M * A/B memory.low = 50M
* A/B/C memory.low = 75M, memory.current = 50M * A/B/C memory.low = 75M, memory.current = 50M
* A/B/D memory.low = 25M, memory.current = 50M * A/B/D memory.low = 25M, memory.current = 50M
...@@ -495,8 +493,6 @@ static int test_memcg_low(const char *root) ...@@ -495,8 +493,6 @@ static int test_memcg_low(const char *root)
goto cleanup; goto cleanup;
} }
if (cg_write(parent[0], "memory.low", "50M"))
goto cleanup;
if (cg_write(parent[1], "memory.low", "50M")) if (cg_write(parent[1], "memory.low", "50M"))
goto cleanup; goto cleanup;
if (cg_write(children[0], "memory.low", "75M")) if (cg_write(children[0], "memory.low", "75M"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment