Skip to content

Commit 449d777

Browse files
Michal Hockotorvalds
authored andcommitted
mm, oom_reaper: clear TIF_MEMDIE for all tasks queued for oom_reaper
Right now the oom reaper will clear TIF_MEMDIE only for tasks which were successfully reaped. This is the safest option because we know that such an oom victim would only block forward progress of the oom killer without a good reason because it is highly unlikely it would release much more memory. Basically most of its memory has been already torn down. We can relax this assumption to catch more corner cases though. The first obvious one is when the oom victim clears its mm and gets stuck later on. oom_reaper would back of on find_lock_task_mm returning NULL. We can safely try to clear TIF_MEMDIE in this case because such a task would be ignored by the oom killer anyway. The flag would be cleared by that time already most of the time anyway. The less obvious one is when the oom reaper fails due to mmap_sem contention. Even if we clear TIF_MEMDIE for this task then it is not very likely that we would select another task too easily because we haven't reaped the last victim and so it would be still the #1 candidate. There is a rare race condition possible when the current victim terminates before the next select_bad_process but considering that oom_reap_task had retried several times before giving up then this sounds like a borderline thing. After this patch we should have a guarantee that the OOM killer will not be block for unbounded amount of time for most cases. Signed-off-by: Michal Hocko <[email protected]> Cc: Raushaniya Maksudova <[email protected]> Cc: Michael S. Tsirkin <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: David Rientjes <[email protected]> Cc: Tetsuo Handa <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Oleg Nesterov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3ef22df commit 449d777

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

mm/oom_kill.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,14 +510,10 @@ static bool __oom_reap_task(struct task_struct *tsk)
510510
up_read(&mm->mmap_sem);
511511

512512
/*
513-
* Clear TIF_MEMDIE because the task shouldn't be sitting on a
514-
* reasonably reclaimable memory anymore. OOM killer can continue
515-
* by selecting other victim if unmapping hasn't led to any
516-
* improvements. This also means that selecting this task doesn't
517-
* make any sense.
513+
* This task can be safely ignored because we cannot do much more
514+
* to release its memory.
518515
*/
519516
tsk->signal->oom_score_adj = OOM_SCORE_ADJ_MIN;
520-
exit_oom_victim(tsk);
521517
out:
522518
mmput(mm);
523519
return ret;
@@ -538,6 +534,15 @@ static void oom_reap_task(struct task_struct *tsk)
538534
debug_show_all_locks();
539535
}
540536

537+
/*
538+
* Clear TIF_MEMDIE because the task shouldn't be sitting on a
539+
* reasonably reclaimable memory anymore or it is not a good candidate
540+
* for the oom victim right now because it cannot release its memory
541+
* itself nor by the oom reaper.
542+
*/
543+
tsk->oom_reaper_list = NULL;
544+
exit_oom_victim(tsk);
545+
541546
/* Drop a reference taken by wake_oom_reaper */
542547
put_task_struct(tsk);
543548
}

0 commit comments

Comments
 (0)