[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1299286307-4386-1-git-send-email-avagin@openvz.org>
Date: Sat, 5 Mar 2011 03:51:47 +0300
From: Andrey Vagin <avagin@...nvz.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: David Rientjes <rientjes@...gle.com>,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
avagin@...nvz.org, linux-mm@...ck.org, linux-kernel@...r.kernel.org
Subject: [PATCH] mm: skip zombie in OOM-killer
When we check that task has flag TIF_MEMDIE, we forgot check that
it has mm. A task may be zombie and a parent may wait a memor.
v2: Check that task doesn't have mm one time and skip it immediately
Signed-off-by: Andrey Vagin <avagin@...nvz.org>
---
mm/oom_kill.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 7dcca55..b1ce3ba 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -299,6 +299,9 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
for_each_process(p) {
unsigned int points;
+ if (!p->mm)
+ continue;
+
if (oom_unkillable_task(p, mem, nodemask))
continue;
@@ -324,7 +327,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
* the process of exiting and releasing its resources.
* Otherwise we could get an easy OOM deadlock.
*/
- if (thread_group_empty(p) && (p->flags & PF_EXITING) && p->mm) {
+ if (thread_group_empty(p) && (p->flags & PF_EXITING)) {
if (p != current)
return ERR_PTR(-1UL);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists