Messages in this thread Patch in this message | | | From | KOSAKI Motohiro <> | Subject | [PATCH 03/12] oom: the points calculation of child processes must use find_lock_task_mm() too | Date | Thu, 3 Jun 2010 14:51:24 +0900 (JST) |
| |
child point calclation use find_lock_task_mm() too.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Oleg Nesterov <oleg@redhat.com> --- mm/oom_kill.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index ce9c744..0542232 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -87,6 +87,7 @@ static struct task_struct *find_lock_task_mm(struct task_struct *p) unsigned long badness(struct task_struct *p, unsigned long uptime) { unsigned long points, cpu_time, run_time; + struct task_struct *c; struct task_struct *child; int oom_adj = p->signal->oom_adj; struct task_cputime task_time; @@ -124,11 +125,13 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * child is eating the vast majority of memory, adding only half * to the parents will make the child our kill candidate of choice. */ - list_for_each_entry(child, &p->children, sibling) { - task_lock(child); - if (child->mm != p->mm && child->mm) - points += child->mm->total_vm/2 + 1; - task_unlock(child); + list_for_each_entry(c, &p->children, sibling) { + child = find_lock_task_mm(c); + if (child) { + if (child->mm != p->mm) + points += child->mm->total_vm/2 + 1; + task_unlock(child); + } } /* -- 1.6.5.2
| |