| Message ID | 20220524162955.8635-3-mkoutny@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1d09069f5313f7c35655dc6d405896f748ddc53f |
| Headers | show |
| Series | memcontrol selftests fixups | expand |
On Tue, May 24, 2022 at 06:29:52PM +0200, Michal Koutny wrote: > This is effectively a revert of commit cdc69458a5f3 ("cgroup: account > for memory_recursiveprot in test_memcg_low()"). The case test_memcg_low > will fail with memory_recursiveprot until resolved in reclaim > code. > However, this patch preserves the existing helpers and variables for > later uses. > > Signed-off-by: Michal Koutný <mkoutny@suse.com> > Reviewed-by: David Vernet <void@manifault.com> Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index c012db9d07d6..4924425639b0 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -528,7 +528,7 @@ static int test_memcg_low(const char *root) } for (i = 0; i < ARRAY_SIZE(children); i++) { - int no_low_events_index = has_recursiveprot ? 2 : 1; + int no_low_events_index = 1; oom = cg_read_key_long(children[i], "memory.events", "oom "); low = cg_read_key_long(children[i], "memory.events", "low ");
This is effectively a revert of commit cdc69458a5f3 ("cgroup: account for memory_recursiveprot in test_memcg_low()"). The case test_memcg_low will fail with memory_recursiveprot until resolved in reclaim code. However, this patch preserves the existing helpers and variables for later uses. Signed-off-by: Michal Koutný <mkoutny@suse.com> Reviewed-by: David Vernet <void@manifault.com> --- tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)