Skip to content

Commit

Permalink
selftests: memcg: expect no low events in unprotected sibling
Browse files Browse the repository at this point in the history
This is effectively a revert of commit cdc6945 ("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>
  • Loading branch information
Michal Koutný authored and akpm committed May 27, 2022
1 parent ff3b72a commit 1d09069
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/testing/selftests/cgroup/test_memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ");
Expand Down

0 comments on commit 1d09069

Please sign in to comment.