[PATCH] oom: OOM-Killed process don't invoke pagefault-oom

[KOSAKI Motohiro]

Nick, I've found this issue by code review. I'm glad if you review this
patch.

Thanks.

=============================
commit 1c0fe6e3 (invoke oom-killer from page fault) created
page fault specific oom handler.

But If OOM occur, alloc_pages() in page fault might return
NULL. It mean page fault return VM_FAULT_OOM. But OOM Killer
itself sholdn't invoke next OOM Kill. it is obviously strange.

Plus, process exiting itself makes some free memory. we
don't need kill another process.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: Nick Piggin <npiggin@xxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
 mm/oom_kill.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 4f167b8..86cecdf 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -596,6 +596,15 @@ void pagefault_out_of_memory(void)
 {
 	unsigned long freed = 0;
 
+	/*
+	 * If the task was received SIGKILL while memory allocation, alloc_pages
+	 * might return NULL and it cause page fault return VM_FAULT_OOM. But
+	 * in such case, the task don't need kill any another task, it need
+	 * just die.
+	 */
+	if (fatal_signal_pending(current))
+		return;
+
 	blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
 	if (freed > 0)
 		/* Got some memory back in the last second. */
-- 
1.6.5.2



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/