Merge branch 'dev-replace-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a49638f41e45a1073eceb0a9adf8d62f1713c931..86349586eacbac5022affca24ebaa2b57d19aa15 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -525,6 +525,8 @@ static void oom_reap_task(struct task_struct *tsk)
 
 static int oom_reaper(void *unused)
 {
+       set_freezable();
+
        while (true) {
                struct task_struct *tsk = NULL;
 
@@ -548,6 +550,10 @@ static void wake_oom_reaper(struct task_struct *tsk)
        if (!oom_reaper_th)
                return;
 
+       /* tsk is already queued? */
+       if (tsk == oom_reaper_list || tsk->oom_reaper_list)
+               return;
+
        get_task_struct(tsk);
 
        spin_lock(&oom_reaper_lock);
@@ -679,7 +685,7 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
        unsigned int victim_points = 0;
        static DEFINE_RATELIMIT_STATE(oom_rs, DEFAULT_RATELIMIT_INTERVAL,
                                              DEFAULT_RATELIMIT_BURST);
-       bool can_oom_reap;
+       bool can_oom_reap = true;
 
        /*
         * If the task is already exiting, don't alarm the sysadmin or kill
@@ -741,10 +747,6 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
        /* Get a reference to safely compare mm after task_unlock(victim) */
        mm = victim->mm;
        atomic_inc(&mm->mm_count);
-
-       /* Make sure we do not try to oom reap the mm multiple times */
-       can_oom_reap = !test_and_set_bit(MMF_OOM_KILLED, &mm->flags);
-
        /*
         * We should send SIGKILL before setting TIF_MEMDIE in order to prevent
         * the OOM victim from depleting the memory reserves from the user