memcg-oom-remove-explicit-wakeup-in-mem_cgroup_oom_synchronize.patch removed from -mm tree
The quilt patch titled
Subject: memcg, oom: remove explicit wakeup in mem_cgroup_oom_synchronize()
has been removed from the -mm tree. Its filename was
memcg-oom-remove-explicit-wakeup-in-mem_cgroup_oom_synchronize.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: Haifeng Xu <[email protected]>
Subject: memcg, oom: remove explicit wakeup in mem_cgroup_oom_synchronize()
Date: Wed, 19 Apr 2023 03:07:39 +0000
Before commit 29ef680ae7c2 ("memcg, oom: move out_of_memory back to the charge path"), all memcg oom killers were delayed to page fault path. And the explicit wakeup is used in this case:
thread A:
...
if (locked) { // complete oom-kill, hold the lock
mem_cgroup_oom_unlock(memcg);
...
}
...thread B:
...
if (locked && !memcg->oom_kill_disable) {
...
} else {
schedule(); // can't acquire the lock
...
}
...The reason is that thread A kicks off the OOM-killer, which leads to wakeups from the uncharges of the exiting task. But thread B is not guaranteed to see them if it enters the OOM path after the OOM kills but before thread A releases the lock.
Now only oom_kill_disable case is handled from the #PF path. In that case it is userspace to trigger the wake up not the #PF path itself. All potential paths to free some charges are responsible to call memcg_oom_recover() , so the explicit wakeup is not needed in the mem_cgroup_oom_synchronize() path which doesn't release any memory itself.
---
mm/memcontrol.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-oom-remove-explicit-wakeup-in-mem_cgroup_oom_synchronize +1 -8
@@ -2028,15 +2028,8 @@ bool mem_cgroup_oom_synchronize(bool hanmem_cgroup_unmark_under_oom (memcg);finish_wait (&memcg_oom_waitq, &owait.wait); -if (locked) { +if (locked)mem_cgroup_oom_unlock (memcg); -/* -* There is no guarantee that an OOM-lock contender -* sees the wakeups triggered by the OOM kill -* uncharges. Wake any sleepers explicitly. -*/ -memcg_oom_recover (memcg); - } cleanup: current->memcg_in_oom =NULL ;css_put (&memcg->css);
_
Patches currently in -mm which might be from [email protected] are
mm-mm_initc-drop-nid-parameter-from-check_for_memory.patch mm-memory_hotplug-remove-reset_node_managed_pages-in-hotadd_init_pgdat.patch mm-mm_initc-remove-reset_node_present_pages.patch fork-optimize-memcg_charge_kernel_stack-a-bit.patch