Messages in this thread Patch in this message | | | From | KOSAKI Motohiro <> | Subject | [PATCH 6/9] oom: use same_thread_group instead comparing ->mm | Date | Wed, 16 Jun 2010 20:34:02 +0900 (JST) |
| |
Now, oom are using "child->mm != p->mm" check to distinguish subthread. But It's incorrect. vfork() child also have the same ->mm.
This patch change to use same_thread_group() instead.
Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> --- mm/oom_kill.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 12204c7..e4b1146 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -161,7 +161,7 @@ unsigned long oom_badness(struct task_struct *p, unsigned long uptime) list_for_each_entry(c, &t->children, sibling) { child = find_lock_task_mm(c); if (child) { - if (child->mm != p->mm) + if (same_thread_group(p, child)) points += child->mm->total_vm/2 + 1; task_unlock(child); } @@ -486,7 +486,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, list_for_each_entry(child, &t->children, sibling) { unsigned long child_points; - if (child->mm == p->mm) + if (same_thread_group(p, child)) continue; if (oom_unkillable_task(child, mem, nodemask)) continue; -- 1.6.5.2
| |