| Message ID | 20220518161859.21565-2-mkoutny@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ff3b72a5d614702ec119f107bddd99cdad622b44 |
| Headers | show |
| Series | [v2,1/5] selftests: memcg: Fix compilation | expand |
On 5/18/22 9:18 PM, Michal Koutný wrote: > This fixes mis-applied changes from commit 72b1e03aa725 ("cgroup: > account for memory_localevents in test_memcg_oom_group_leaf_events()"). Shouldn't the Fixes tag be added here and in 2/5 patch?
On Sat, May 21, 2022 at 07:11:01PM +0500, Muhammad Usama Anjum <usama.anjum@collabora.com> wrote: > On 5/18/22 9:18 PM, Michal Koutný wrote: > > This fixes mis-applied changes from commit 72b1e03aa725 ("cgroup: > > account for memory_localevents in test_memcg_oom_group_leaf_events()"). > Shouldn't the Fixes tag be added here and in 2/5 patch? Ad the patch 1/5 -- yes, sounds appropriate. Ad the patch 2/5 -- that's an effective revert, I don't see reverts being marked with Fixes. I see the patch 5/5 didn't make it to MLs (their public archives, except for LKML). So I'll resend the series with the modified commit message (if nothing else pops up). Michal
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 6ab94317c87b..c012db9d07d6 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1241,7 +1241,16 @@ static int test_memcg_oom_group_leaf_events(const char *root) if (cg_read_key_long(child, "memory.events", "oom_kill ") <= 0) goto cleanup; - if (cg_read_key_long(parent, "memory.events", "oom_kill ") <= 0) + parent_oom_events = cg_read_key_long( + parent, "memory.events", "oom_kill "); + /* + * If memory_localevents is not enabled (the default), the parent should + * count OOM events in its children groups. Otherwise, it should not + * have observed any events. + */ + if (has_localevents && parent_oom_events != 0) + goto cleanup; + else if (!has_localevents && parent_oom_events <= 0) goto cleanup; ret = KSFT_PASS; @@ -1349,20 +1358,14 @@ static int test_memcg_oom_group_score_events(const char *root) if (!cg_run(memcg, alloc_anon, (void *)MB(100))) goto cleanup; - parent_oom_events = cg_read_key_long( - parent, "memory.events", "oom_kill "); - /* - * If memory_localevents is not enabled (the default), the parent should - * count OOM events in its children groups. Otherwise, it should not - * have observed any events. - */ - if ((has_localevents && parent_oom_events == 0) || - parent_oom_events > 0) - ret = KSFT_PASS; + if (cg_read_key_long(memcg, "memory.events", "oom_kill ") != 3) + goto cleanup; if (kill(safe_pid, SIGKILL)) goto cleanup; + ret = KSFT_PASS; + cleanup: if (memcg) cg_destroy(memcg);
This fixes mis-applied changes from commit 72b1e03aa725 ("cgroup: account for memory_localevents in test_memcg_oom_group_leaf_events()"). Signed-off-by: Michal Koutný <mkoutny@suse.com> Reviewed-by: David Vernet <void@manifault.com> Acked-by: Roman Gushchin <roman.gushchin@linux.dev> --- .../selftests/cgroup/test_memcontrol.c | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-)