summaryrefslogtreecommitdiff
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-08-09 17:19:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 20:45:01 -0700
commitf88ccad5886d5a864b8b0d48c666ee9998dec53f (patch)
treefc6da2064c660a270cff82bb2f97f21ce537a369 /mm/oom_kill.c
parentab290adbaf8f46770f014ea87968de5baca29c30 (diff)
downloadlinux-3.10-f88ccad5886d5a864b8b0d48c666ee9998dec53f.tar.gz
linux-3.10-f88ccad5886d5a864b8b0d48c666ee9998dec53f.tar.bz2
linux-3.10-f88ccad5886d5a864b8b0d48c666ee9998dec53f.zip
oom: oom_kill_process() needs to check that p is unkillable
When oom_kill_allocating_task is enabled, an argument task of oom_kill_process is not selected by select_bad_process(), It's just out_of_memory() caller task. It mean the task can be unkillable. check it first. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Cc: David Rientjes <rientjes@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r--mm/oom_kill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 2c993e47487..3999747aef4 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -687,7 +687,8 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
check_panic_on_oom(constraint, gfp_mask, order);
read_lock(&tasklist_lock);
- if (sysctl_oom_kill_allocating_task) {
+ if (sysctl_oom_kill_allocating_task &&
+ !oom_unkillable_task(current, NULL, nodemask)) {
/*
* oom_kill_process() needs tasklist_lock held. If it returns
* non-zero, current could not be killed so we must fallback to