]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
selftests: memcg: expect no low events in unprotected sibling
authorMichal Koutný <mkoutny@suse.com>
Wed, 18 May 2022 16:18:56 +0000 (18:18 +0200)
committerakpm <akpm@linux-foundation.org>
Fri, 27 May 2022 16:33:45 +0000 (09:33 -0700)
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>
tools/testing/selftests/cgroup/test_memcontrol.c

index 9b8213479b8bff84a4e862a383ef8be11adc7296..7514bf7c0c3e38f3d5e0655bb8d0caba4b0ec87a 100644 (file)
@@ -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 ");