lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: invoke oom-killer from page fault

Browse Source 
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: linux-sh@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Nick Piggin
2010-04-22 16:06:26 +00:00
committed by Paul Mundt
parent 4a6feab0ee
commit 6b6b18e62c
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/sh/mm/fault_32.c
View File

@@ -290,15 +290,10 @@ no_context:
*/ */
out_of_memory: out_of_memory:
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
if (is_global_init(current)) { if (!user_mode(regs))
yield();
down_read(&mm->mmap_sem);
goto survive;
}
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context; goto no_context;
pagefault_out_of_memory();
return;
do_sigbus: do_sigbus:
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);

17
arch/sh/mm/tlbflush_64.c
View File

@@ -294,22 +294,11 @@ no_context:
* us unable to handle the page fault gracefully. * us unable to handle the page fault gracefully.
*/ */
out_of_memory: out_of_memory:
if (is_global_init(current)) {
panic("INIT out of memory\n");
yield();
goto survive;
}
printk("fault:Out of memory\n");
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
if (is_global_init(current)) { if (!user_mode(regs))
yield();
down_read(&mm->mmap_sem);
goto survive;
}
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context; goto no_context;
pagefault_out_of_memory();
return;
do_sigbus: do_sigbus:
printk("fault:Do sigbus\n"); printk("fault:Do sigbus\n");