From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + xtensa-invoke-oom-killer-from-page-fault.patch added to -mm tree Date: Fri, 28 May 2010 16:19:09 -0700 Message-ID: <201005282319.o4SNJ9BD020090@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:59084 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253Ab0E1XTR (ORCPT ); Fri, 28 May 2010 19:19:17 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: npiggin@suse.de, chris@zankel.net, rientjes@google.com The patch titled xtensa: invoke oom-killer from page fault has been added to the -mm tree. Its filename is xtensa-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: xtensa: invoke oom-killer from page fault From: Nick Piggin 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 Acked-by: David Rientjes Cc: Chris Zankel Signed-off-by: Andrew Morton --- arch/xtensa/mm/fault.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff -puN arch/xtensa/mm/fault.c~xtensa-invoke-oom-killer-from-page-fault arch/xtensa/mm/fault.c --- a/arch/xtensa/mm/fault.c~xtensa-invoke-oom-killer-from-page-fault +++ a/arch/xtensa/mm/fault.c @@ -105,7 +105,6 @@ good_area: * make sure we exit gracefully rather than endlessly redo * the fault. */ -survive: fault = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) @@ -146,15 +145,10 @@ bad_area: */ 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", current->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - bad_page_fault(regs, address, SIGKILL); + if (!user_mode(regs)) + bad_page_fault(regs, address, SIGKILL); + else + pagefault_out_of_memory(); return; do_sigbus: _ 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