]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
oom: check PF_KTHREAD instead of !mm to skip kthreads
authorOleg Nesterov <oleg@redhat.com>
Tue, 10 Aug 2010 00:18:43 +0000 (17:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 03:44:55 +0000 (20:44 -0700)
select_bad_process() thinks a kernel thread can't have ->mm != NULL, this
is not true due to use_mm().

Change the code to check PF_KTHREAD.

Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/oom_kill.c

index 709aedfaa014946664f2b83857b749d92f79752f..7c0dc414dba896486bf786a2342ade250d14ea23 100644 (file)
@@ -256,14 +256,11 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
        for_each_process(p) {
                unsigned long points;
 
-               /*
-                * skip kernel threads and tasks which have already released
-                * their mm.
-                */
+               /* skip tasks that have already released their mm */
                if (!p->mm)
                        continue;
-               /* skip the init task */
-               if (is_global_init(p))
+               /* skip the init task and kthreads */
+               if (is_global_init(p) || (p->flags & PF_KTHREAD))
                        continue;
                if (mem && !task_in_mem_cgroup(p, mem))
                        continue;