Re: [patch 12/14] score: invoke oom-killer from page fault

liqin.chen
2010-04-28T07:49:22Z

npiggin@suse.de 写于 2010-04-23 00:06:25:

> 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: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: linux-arch@vger.kernel.org
> Signed-off-by: Nick Piggin <npiggin@suse.de>
> ---
> Index: linux-2.6/arch/score/mm/fault.c
> ===================================================================
> --- linux-2.6.orig/arch/score/mm/fault.c
> +++ linux-2.6/arch/score/mm/fault.c
> @@ -167,15 +167,10 @@ no_context:
> */
> out_of_memory:
> up_read(&mm->mmap_sem);
> - if (is_global_init(tsk)) {
> - 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;
> + if (!user_mode(regs))
> + goto no_context;
> + pagefault_out_of_memory();
> + return;
>
> do_sigbus:
> up_read(&mm->mmap_sem);
>
>

Thanks, commited to score repository.

liqin