diff options
| author |   Michal Koutný <mkoutny@suse.com> | 2022-05-18 18:18:56 +0200 |
|---|---|---|
| committer |   akpm <akpm@linux-foundation.org> | 2022-05-27 09:33:45 -0700 |
| commit | 1d09069f5313f7c35655dc6d405896f748ddc53f (patch) | |
| tree | ba2f2e7f79b018ffec0447bbf609d63f18d4ed23 /tools/testing/selftests/cgroup | |
| parent | selftests: memcg: fix compilation (diff) | |
| download | linux-dev-1d09069f5313f7c35655dc6d405896f748ddc53f.tar.xz linux-dev-1d09069f5313f7c35655dc6d405896f748ddc53f.zip | |
selftests: memcg: expect no low events in unprotected sibling
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.
Link: https://lkml.kernel.org/r/20220518161859.21565-3-mkoutny@suse.com
Signed-off-by: Michal Koutný <mkoutny@suse.com>
Reviewed-by: David Vernet <void@manifault.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Richard Palethorpe <rpalethorpe@suse.de>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'tools/testing/selftests/cgroup')
| -rw-r--r-- | tools/testing/selftests/cgroup/test_memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 9b8213479b8b..7514bf7c0c3e 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 "); |