Commit 455c0e5f authored Aug 09, 2010 by Oleg Nesterov Committed by Linus Torvalds Aug 09, 2010

oom: check PF_KTHREAD instead of !mm to skip kthreads



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>

parent a9877cc2

mm/oom_kill.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -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;

Admin message