From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
To: LKML <linux-kernel@vger.kernel.org>,
linux-mm <linux-mm@kvack.org>,
Andrew Morton <akpm@linux-foundation.org>,
David Rientjes <rientjes@google.com>,
Minchan Kim <minchan.kim@gmail.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: kosaki.motohiro@jp.fujitsu.com
Subject: [PATCH 1/9] oom: don't try to kill oom_unkillable child
Date: Thu, 17 Jun 2010 10:45:09 +0900 (JST) [thread overview]
Message-ID: <20100617104311.FB7A.A69D9226@jp.fujitsu.com> (raw)
Now, badness() doesn't care neigher CPUSET nor mempolicy. Then
if the victim child process have disjoint nodemask, __out_of_memory()
can makes kernel hang eventually.
This patch fixes it.
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
---
mm/oom_kill.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 26ae697..0aeacb2 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -429,7 +429,7 @@ static int oom_kill_task(struct task_struct *p)
static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
unsigned long points, struct mem_cgroup *mem,
- const char *message)
+ nodemask_t *nodemask, const char *message)
{
struct task_struct *victim = p;
struct task_struct *child;
@@ -469,6 +469,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
continue;
if (mem && !task_in_mem_cgroup(child, mem))
continue;
+ if (!has_intersects_mems_allowed(child, nodemask))
+ continue;
/* badness() returns 0 if the thread is unkillable */
child_points = badness(child, uptime.tv_sec);
@@ -519,7 +521,7 @@ retry:
if (!p || PTR_ERR(p) == -1UL)
goto out;
- if (oom_kill_process(p, gfp_mask, 0, points, mem,
+ if (oom_kill_process(p, gfp_mask, 0, points, mem, NULL,
"Memory cgroup out of memory"))
goto retry;
out:
@@ -678,7 +680,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
* non-zero, current could not be killed so we must fallback to
* the tasklist scan.
*/
- if (!oom_kill_process(current, gfp_mask, order, 0, NULL,
+ if (!oom_kill_process(current, gfp_mask, order, 0, NULL, nodemask,
"Out of memory (oom_kill_allocating_task)"))
return;
}
@@ -697,7 +699,7 @@ retry:
panic("Out of memory and no killable processes...\n");
}
- if (oom_kill_process(p, gfp_mask, order, points, NULL,
+ if (oom_kill_process(p, gfp_mask, order, points, NULL, nodemask,
"Out of memory"))
goto retry;
read_unlock(&tasklist_lock);
--
1.6.5.2
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2010-06-17 1:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-17 1:45 KOSAKI Motohiro [this message]
2010-06-17 1:51 ` [PATCH 3/9] oom: make oom_unkillable_task() helper function KOSAKI Motohiro
2010-06-21 20:15 ` David Rientjes
2010-06-30 9:26 ` KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 2/9] oom: oom_kill_process() doesn't select kthread child KOSAKI Motohiro
2010-06-21 20:14 ` David Rientjes
2010-06-30 9:26 ` KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 5/9] oom: cleanup has_intersects_mems_allowed() KOSAKI Motohiro
2010-06-17 4:20 ` David Rientjes
2010-06-21 11:45 ` KOSAKI Motohiro
2010-06-21 20:09 ` David Rientjes
2010-06-30 9:26 ` KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 4/9] oom: oom_kill_process() need to check p is unkillable KOSAKI Motohiro
2010-06-17 4:19 ` David Rientjes
2010-06-21 11:45 ` KOSAKI Motohiro
2010-06-21 14:00 ` Minchan Kim
2010-06-21 20:04 ` David Rientjes
2010-06-30 9:26 ` KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 8/9] oom: give the dying task a higher priority KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 6/9] oom: unify CAP_SYS_RAWIO check into other superuser check KOSAKI Motohiro
2010-06-17 4:18 ` David Rientjes
2010-06-21 11:46 ` KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 7/9] oom: remove child->mm check from oom_kill_process() KOSAKI Motohiro
2010-06-17 1:51 ` [PATCH 9/9] oom: multi threaded process coredump don't make deadlock KOSAKI Motohiro
-- strict thread matches above, loose matches on Subject: below --
2010-06-16 11:29 [PATCH 1/9] oom: don't try to kill oom_unkillable child KOSAKI Motohiro
2010-06-16 14:41 ` Minchan Kim
2010-06-17 1:51 ` KOSAKI Motohiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100617104311.FB7A.A69D9226@jp.fujitsu.com \
--to=kosaki.motohiro@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan.kim@gmail.com \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox