From: David Rientjes <rientjes@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Oleg Nesterov <oleg@redhat.com>, Rik van Riel <riel@redhat.com>,
linux-mm@kvack.org
Subject: [patch 2/2] oom: kill all threads sharing oom killed task's mm
Date: Sat, 14 Aug 2010 21:31:00 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1008142130260.31510@chino.kir.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1008142128050.31510@chino.kir.corp.google.com>
It's necessary to kill all threads that share an oom killed task's mm if
the goal is to lead to future memory freeing.
This patch reintroduces the code removed in 8c5cd6f3 (oom: oom_kill
doesn't kill vfork parent (or child)) since it is obsoleted.
It's now guaranteed that any task passed to oom_kill_task() does not
share an mm with any thread that is unkillable. Thus, we're safe to
issue a SIGKILL to any thread sharing the same mm.
This is especially necessary to solve an mm->mmap_sem livelock issue
whereas an oom killed thread must acquire the lock in the exit path while
another thread is holding it in the page allocator while trying to
allocate memory itself (and will preempt the oom killer since a task was
already killed). Since tasks with pending fatal signals are now granted
access to memory reserves, the thread holding the lock may quickly
allocate and release the lock so that the oom killed task may exit.
Signed-off-by: David Rientjes <rientjes@google.com>
---
mm/oom_kill.c | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -416,18 +416,24 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
#define K(x) ((x) << (PAGE_SHIFT-10))
static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
{
+ struct task_struct *g, *q;
+ struct mm_struct *mm;
+
p = find_lock_task_mm(p);
if (!p) {
task_unlock(p);
return 1;
}
+
+ /* mm cannot be safely dereferenced after task_unlock(p) */
+ mm = p->mm;
+
pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
task_pid_nr(p), p->comm, K(p->mm->total_vm),
K(get_mm_counter(p->mm, MM_ANONPAGES)),
K(get_mm_counter(p->mm, MM_FILEPAGES)));
task_unlock(p);
-
set_tsk_thread_flag(p, TIF_MEMDIE);
force_sig(SIGKILL, p);
@@ -438,6 +444,20 @@ static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
*/
boost_dying_task_prio(p, mem);
+ /*
+ * Kill all threads sharing p->mm in other thread groups, if any. They
+ * don't get access to memory reserves or a higher scheduler priority,
+ * though, to avoid depletion of all memory or task starvation. This
+ * prevents mm->mmap_sem livelock when an oom killed task cannot exit
+ * because it requires the semaphore and its contended by another
+ * thread trying to allocate memory itself. That thread will now get
+ * access to memory reserves since it has a pending fatal signal.
+ */
+ do_each_thread(g, q) {
+ if (q->mm == mm && !same_thread_group(q, p))
+ force_sig(SIGKILL, q);
+ } while_each_thread(g, q);
+
return 0;
}
#undef K
--
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 prev parent reply other threads:[~2010-08-15 4:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-15 4:30 [patch 1/2] oom: avoid killing a task if a thread sharing its mm cannot be killed David Rientjes
2010-08-15 4:31 ` David Rientjes [this message]
2010-08-15 15:45 ` [patch 2/2] oom: kill all threads sharing oom killed task's mm Oleg Nesterov
2010-08-15 21:28 ` David Rientjes
2010-08-16 6:00 ` Oleg Nesterov
2010-08-15 15:18 ` [patch 1/2] oom: avoid killing a task if a thread sharing its mm cannot be killed Oleg Nesterov
2010-08-15 21:23 ` David Rientjes
2010-08-16 5:52 ` Oleg Nesterov
2010-08-16 10:56 ` David Rientjes
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=alpine.DEB.2.00.1008142130260.31510@chino.kir.corp.google.com \
--to=rientjes@google.com \
--cc=akpm@linux-foundation.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=oleg@redhat.com \
--cc=riel@redhat.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