diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2010-08-10 02:18:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 05:44:55 +0200 |
| commit | 455c0e5fb03b67fa62bd12e3abe3fa484b9960c5 (patch) | |
| tree | 082cbecb8927e1c8e0c2cea5d5639e9c8f62eafe | |
| parent | buffer_head: remove redundant test from wait_on_buffer (diff) | |
| download | linux-455c0e5fb03b67fa62bd12e3abe3fa484b9960c5.tar.xz linux-455c0e5fb03b67fa62bd12e3abe3fa484b9960c5.zip | |
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>
| -rw-r--r-- | mm/oom_kill.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 709aedfaa014..7c0dc414dba8 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -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; |