leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

During VM oom condition, kill all threads in process group

Browse Source 
We have had complaints where a threaded application is left in a bad state
after one of it's threads is killed when we hit a VM: out_of_memory
condition.

Killing just one of the process threads can leave the application in a bad
state, whereas killing the entire process group would allow for the
application to restart, or be otherwise handled, and makes it very obvious
that something has gone wrong.

This change allows the entire process group to be taken down, rather
than just the one thread.

Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Matthew Wilcox <willy@debian.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Will Schmidt 2007-10-16 01:24:18 -07:00 committed by Linus Torvalds
parent 1cd7daa51b
commit dcca2bde4f
18 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/mm/fault.c
View File

@ -197,7 +197,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
current->comm, current->pid); current->comm, current->pid);
if (!user_mode(regs)) if (!user_mode(regs))
goto no_context; goto no_context;
do_exit(SIGKILL); do_group_exit(SIGKILL);
do_sigbus: do_sigbus:
/* Send a sigbus, regardless of whether we were in kernel /* Send a sigbus, regardless of whether we were in kernel

2
arch/arm/mm/fault.c
View File

@ -266,7 +266,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
* the page fault gracefully. * the page fault gracefully.
*/ */
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
do_exit(SIGKILL); do_group_exit(SIGKILL);
return 0; return 0;
} }
if (fault & VM_FAULT_SIGBUS) { if (fault & VM_FAULT_SIGBUS) {

2
arch/avr32/mm/fault.c
View File

@ -216,7 +216,7 @@ out_of_memory:
} }
printk("VM: Killing process %s\n", tsk->comm); printk("VM: Killing process %s\n", tsk->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/cris/mm/fault.c
View File

@ -360,7 +360,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/frv/mm/fault.c
View File

@ -259,7 +259,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", current->comm); printk("VM: killing process %s\n", current->comm);
if (user_mode(__frame)) if (user_mode(__frame))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/ia64/mm/fault.c
View File

@ -281,6 +281,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
} }
printk(KERN_CRIT "VM: killing process %s\n", current->comm); printk(KERN_CRIT "VM: killing process %s\n", current->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
} }

2
arch/m32r/mm/fault.c
View File

@ -278,7 +278,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (error_code & ACE_USERMODE) if (error_code & ACE_USERMODE)
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/m68k/mm/fault.c
View File

@ -188,7 +188,7 @@ out_of_memory:
printk("VM: killing process %s\n", current->comm); printk("VM: killing process %s\n", current->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
no_context: no_context:
current->thread.signo = SIGBUS; current->thread.signo = SIGBUS;

2
arch/mips/mm/fault.c
View File

@ -180,7 +180,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/parisc/mm/fault.c
View File

@ -263,6 +263,6 @@ no_context:
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
printk(KERN_CRIT "VM: killing process %s\n", current->comm); printk(KERN_CRIT "VM: killing process %s\n", current->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
} }

2
arch/ppc/mm/fault.c
View File

@ -297,7 +297,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", current->comm); printk("VM: killing process %s\n", current->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
return SIGKILL; return SIGKILL;
do_sigbus: do_sigbus:

2
arch/s390/mm/fault.c
View File

@ -218,7 +218,7 @@ static int do_out_of_memory(struct pt_regs *regs, unsigned long error_code,
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (regs->psw.mask & PSW_MASK_PSTATE) if (regs->psw.mask & PSW_MASK_PSTATE)
do_exit(SIGKILL); do_group_exit(SIGKILL);
do_no_context(regs, error_code, address); do_no_context(regs, error_code, address);
return 0; return 0;
} }

2
arch/sh/mm/fault.c
View File

@ -214,7 +214,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/sh64/mm/fault.c
View File

@ -334,7 +334,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/sparc/mm/fault.c
View File

@ -369,7 +369,7 @@ out_of_memory:
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (from_user) if (from_user)
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/sparc64/mm/fault.c
View File

@ -463,7 +463,7 @@ out_of_memory:
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", current->comm); printk("VM: killing process %s\n", current->comm);
if (!(regs->tstate & TSTATE_PRIV)) if (!(regs->tstate & TSTATE_PRIV))
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto handle_kernel_fault; goto handle_kernel_fault;
intr_or_no_mm: intr_or_no_mm:

2
arch/x86/mm/fault_32.c
View File

@ -593,7 +593,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", tsk->comm); printk("VM: killing process %s\n", tsk->comm);
if (error_code & 4) if (error_code & 4)
do_exit(SIGKILL); do_group_exit(SIGKILL);
goto no_context; goto no_context;
do_sigbus: do_sigbus:

2
arch/xtensa/mm/fault.c
View File

@ -152,7 +152,7 @@ out_of_memory:
} }
printk("VM: killing process %s\n", current->comm); printk("VM: killing process %s\n", current->comm);
if (user_mode(regs)) if (user_mode(regs))
do_exit(SIGKILL); do_group_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL); bad_page_fault(regs, address, SIGKILL);
return; return;