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

Commit e460c2c9 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Invoke oom-killer from page fault 



As explained in commit 1c0fe6e3, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.

Cc: linuxppc-dev@ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 91eea67c

arch/powerpc/mm/fault.c

+4 −10
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, 
	 * make sure we exit gracefully rather than endlessly redo

	 * the fault.

	 */

 survive:

	ret = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0);

	if (unlikely(ret & VM_FAULT_ERROR)) {

		if (ret & VM_FAULT_OOM)
@@ -360,15 +359,10 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, 
 */

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

		return SIGKILL;

	pagefault_out_of_memory();

	return 0;



do_sigbus:

	up_read(&mm->mmap_sem);