Skip to content

Commit

Permalink
mm: don't emit warning from pagefault_out_of_memory()
Browse files Browse the repository at this point in the history
Commit c32b3cb ("oom, PM: make OOM detection in the freezer path
raceless") inserted a WARN_ON() into pagefault_out_of_memory() in order
to warn when we raced with disabling the OOM killer.

Now, patch "oom, suspend: fix oom_killer_disable vs.  pm suspend
properly" introduced a timeout for oom_killer_disable().  Even if we
raced with disabling the OOM killer and the system is OOM livelocked,
the OOM killer will be enabled eventually (in 20 seconds by default) and
the OOM livelock will be solved.  Therefore, we no longer need to warn
when we raced with disabling the OOM killer.

Link: http://lkml.kernel.org/r/1473442120-7246-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Tetsuo Handa authored and Linus Torvalds committed Oct 8, 2016
1 parent 2031142 commit a104808
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions mm/oom_kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -1069,16 +1069,6 @@ void pagefault_out_of_memory(void)

if (!mutex_trylock(&oom_lock))
return;

if (!out_of_memory(&oc)) {
/*
* There shouldn't be any user tasks runnable while the
* OOM killer is disabled, so the current task has to
* be a racing OOM victim for which oom_killer_disable()
* is waiting for.
*/
WARN_ON(test_thread_flag(TIF_MEMDIE));
}

out_of_memory(&oc);
mutex_unlock(&oom_lock);
}

0 comments on commit a104808

Please sign in to comment.