powerpc: Invoke oom-killer from page fault

As explained in commit 1c0fe6e3bd, 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: Nick Piggin <npiggin@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 83ac4935eb10..1bd712c33ce2 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -308,7 +308,6 @@ good_area:
          * 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 @@ bad_area_nosemaphore:
  */
 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);
-        return SIGKILL;
+        if (!user_mode(regs))
+                return SIGKILL;
+        pagefault_out_of_memory();
+        return 0;
 
 do_sigbus:
         up_read(&mm->mmap_sem);