selftests-memcg-fix-compilation.patch removed from -mm tree
The quilt patch titled
Subject: selftests: memcg: fix compilation
has been removed from the -mm tree. Its filename was
selftests-memcg-fix-compilation.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Michal Koutný <[email protected]>
Subject: selftests: memcg: fix compilation
Date: Wed, 18 May 2022 18:18:55 +0200
Patch series "memcontrol selftests fixups", v2.
Flushing the patches to make memcontrol selftests check the events behavior we had consensus about (test_memcg_low fails).
(test_memcg_reclaim, test_memcg_swap_max fail for me now but it's present even before the refactoring.)
The two bigger changes are:
- adjustment of the protected values to make tests succeed with the given tolerance,
- both test_memcg_low and test_memcg_min check protection of memory in populated cgroups (actually as per Documentation/admin-guide/cgroup-v2.rst memory.min should not apply to empty cgroups, which is not the case currently. Therefore I unified tests with the populated case in order to to bring more broken tests).
This patch (of 5):
This fixes mis-applied changes from commit 72b1e03aa725 ("cgroup: account for memory_localevents in test_memcg_oom_group_leaf_events()").
---
tools/testing/selftests/cgroup/test_memcontrol.c | 25 +++++++------ 1 file changed, 14 insertions(+), 11 deletions(-)
tools/testing/selftests/cgroup/test_memcontrol.c renamed from tools/testing/selftests/cgroup/test_memcontrol.c~selftests-memcg-fix-compilation +14 -11
@@ -1241,7 +1241,16 @@ static int test_memcg_oom_group_leaf_eveif (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_evif (!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);
_
Patches currently in -mm which might be from [email protected] are