The patch titled
Subject: oom: don't count on mm-less current process
has been removed from the -mm tree. Its filename was
oom-dont-count-on-mm-less-current-process.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Subject: oom: don't count on mm-less current process
out_of_memory() doesn't trigger the OOM killer if the current task is
already exiting or it has fatal signals pending, and gives the task access
to memory reserves instead. However, doing so is wrong if out_of_memory()
is called by an allocation (e.g. from exit_task_work()) after the current
task has already released its memory and cleared TIF_MEMDIE at exit_mm().
If we again set TIF_MEMDIE to post-exit_mm() current task, the OOM killer
will be blocked by the task sitting in the final schedule() waiting for
its parent to reap it. It will trigger an OOM livelock if its parent is
unable to reap it due to doing an allocation and waiting for the OOM
killer to kill it.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/oom_kill.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN mm/oom_kill.c~oom-dont-count-on-mm-less-current-process mm/oom_kill.c
--- a/mm/oom_kill.c~oom-dont-count-on-mm-less-current-process
+++ a/mm/oom_kill.c
@@ -643,8 +643,12 @@ void out_of_memory(struct zonelist *zone
* If current has a pending SIGKILL or is exiting, then automatically
* select it. The goal is to allow it to allocate so that it may
* quickly exit and free its memory.
+ *
+ * But don't select if current has already released its mm and cleared
+ * TIF_MEMDIE flag at exit_mm(), otherwise an OOM livelock may occur.
*/
- if (fatal_signal_pending(current) || task_will_free_mem(current)) {
+ if (current->mm &&
+ (fatal_signal_pending(current) || task_will_free_mem(current))) {
set_thread_flag(TIF_MEMDIE);
return;
}
_
Patches currently in -mm which might be from penguin-kernel@xxxxxxxxxxxxxxxxxxx are
origin.patch
lib-vsprintf-add-%pt-format-specifier.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
