powerpc: Invoke oom-killer from page fault

As explained in commit 1c0fe6e, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Cc: [email protected] Cc: Benjamin Herrenschmidt <[email protected]> Cc: [email protected] Signed-off-by: Nick Piggin <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
diverger · May 6, 2010 · e460c2c · e460c2c
1 parent 91eea67
commit e460c2c
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
@@ -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);
-	return SIGKILL;
+	if (!user_mode(regs))
+		return SIGKILL;
+	pagefault_out_of_memory();
+	return 0;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);