Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76f5d71 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

xtensa: invoke oom-killer from page fault 



As explained in commit 1c0fe6e3 ("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: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c421b08e

arch/xtensa/mm/fault.c

+4 −10
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ void do_page_fault(struct pt_regs *regs) 
	 * 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 @@ void do_page_fault(struct pt_regs *regs) 
	 */

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);

	if (!user_mode(regs))

		bad_page_fault(regs, address, SIGKILL);

	else

		pagefault_out_of_memory();

	return;



do_sigbus: