Linux MM tree latest commits
 help / color / mirror / Atom feed
* + avr32-invoke-oom-killer-from-page-fault.patch added to -mm tree
@ 2010-05-28 23:19 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2010-05-28 23:19 UTC (permalink / raw)
  To: mm-commits; +Cc: npiggin, hskinnemoen, rientjes


The patch titled
     avr32: invoke oom-killer from page fault
has been added to the -mm tree.  Its filename is
     avr32-invoke-oom-killer-from-page-fault.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: avr32: invoke oom-killer from page fault
From: Nick Piggin <npiggin@suse.de>

As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page
fault") , we want to call the architecture independent oom killer when
getting an unexplained OOM from handle_mm_fault, rather than simply
killing current.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/avr32/mm/fault.c |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff -puN arch/avr32/mm/fault.c~avr32-invoke-oom-killer-from-page-fault arch/avr32/mm/fault.c
--- a/arch/avr32/mm/fault.c~avr32-invoke-oom-killer-from-page-fault
+++ a/arch/avr32/mm/fault.c
@@ -132,7 +132,6 @@ good_area:
 	 * sure we exit gracefully rather than endlessly redo the
 	 * fault.
 	 */
-survive:
 	fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);
 	if (unlikely(fault & VM_FAULT_ERROR)) {
 		if (fault & VM_FAULT_OOM)
@@ -211,15 +210,10 @@ no_context:
 	 */
 out_of_memory:
 	up_read(&mm->mmap_sem);
-	if (is_global_init(current)) {
-		yield();
-		down_read(&mm->mmap_sem);
-		goto survive;
-	}
-	printk("VM: Killing process %s\n", tsk->comm);
-	if (user_mode(regs))
-		do_group_exit(SIGKILL);
-	goto no_context;
+	pagefault_out_of_memory();
+	if (!user_mode(regs))
+		goto no_context;
+	return;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);
_

Patches currently in -mm which might be from npiggin@suse.de are

origin.patch
fb_defio-redo-fix-for-non-dirty-ptes.patch
block-bd_start_claiming-fix-module-refcount.patch
block-bd_start_claiming-cleanup.patch
fs-splicec-fix-mapping_gfp_mask-usage.patch
reiser4.patch
avr32-invoke-oom-killer-from-page-fault.patch
frv-invoke-oom-killer-from-page-fault.patch
m32r-invoke-oom-killer-from-page-fault.patch
mn10300-invoke-oom-killer-from-page-fault.patch
xtensa-invoke-oom-killer-from-page-fault.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-05-28 23:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-28 23:19 + avr32-invoke-oom-killer-from-page-fault.patch added to -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox