[PATCH 6/9] oom: use same_thread_group instead comparing ->mm
in [Kernel]
|
Prev: [PATCH 7/9] oom: unify CAP_SYS_RAWIO check into other superuser check
Next: [PATCH 4/9] oom: oom_kill_process() need to check p is unkillable
From: KOSAKI Motohiro on 16 Jun 2010 07:40 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(a)redhat.com> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro(a)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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |