Skip to contentSkip to conversation

kselftests-memcg-update-the-oom-group-leaf-events-test.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 10, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kselftests: memcg: update the oom group leaf events test
has been removed from the -mm tree. Its filename was
kselftests-memcg-update-the-oom-group-leaf-events-test.patch

This patch was dropped because it was merged into mm-stable

------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: kselftests: memcg: update the oom group leaf events test

Patch series "mm: memcg kselftests fixes".

This patch (of 4):

Commit 9852ae3fe529 ("mm, memcg: consider subtrees in memory.events") made memory.events recursive: all events are propagated upwards by the tree. It was a change in semantics.

It broke the oom group leaf events test: it assumes that after an OOM the oom_kill counter is zero on parent's level.

Let's adjust the test: it should have similar expectations for the child and parent levels.

The test passes after this fix.

---

 tools/testing/selftests/cgroup/test_memcontrol.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/cgroup/test_memcontrol.c renamed from tools/testing/selftests/cgroup/test_memcontrol.c~kselftests-memcg-update-the-oom-group-leaf-events-test +3 -2
@@ -1079,7 +1079,8 @@ cleanup:
 /*
  * This test disables swapping and tries to allocate anonymous memory
  * up to OOM with memory.group.oom set. Then it checks that all
- * processes in the leaf (but not the parent) were killed.
+ * processes in the leaf were killed. It also checks that oom_events
+ * were propagated to the parent level.
  */
 static int test_memcg_oom_group_leaf_events(const char *root)
 {
@@ -1122,7 +1123,7 @@ static int test_memcg_oom_group_leaf_eve
 	if (cg_read_key_long(child, "memory.events", "oom_kill ") <= 0)
 		goto cleanup;
 
-	if (cg_read_key_long(parent, "memory.events", "oom_kill ") != 0)
+	if (cg_read_key_long(parent, "memory.events", "oom_kill ") <= 0)
 		goto cleanup;
 
 	ret = KSFT_PASS;

_

Patches currently in -mm which might be from [email protected] are