openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] oom: cleanup messages 

Clean up the OOM killer messages to be more consistent.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nick Piggin 2006-12-06 20:31:51 -08:00 committed by Linus Torvalds
parent c33e0fca35
commit f3af38d30c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mm/oom_kill.c
View File

@ -264,7 +264,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
* flag though it's unlikely that we select a process with CAP_SYS_RAW_IO * flag though it's unlikely that we select a process with CAP_SYS_RAW_IO
* set. * set.
*/ */
static void __oom_kill_task(struct task_struct *p, const char *message) static void __oom_kill_task(struct task_struct *p, int verbose)
{ {
if (is_init(p)) { if (is_init(p)) {
WARN_ON(1); WARN_ON(1);
@ -278,10 +278,8 @@ static void __oom_kill_task(struct task_struct *p, const char *message)
return; return;
} }
if (message) { if (verbose)
printk(KERN_ERR "%s: Killed process %d (%s).\n", printk(KERN_ERR "Killed process %d (%s)\n", p->pid, p->comm);
message, p->pid, p->comm);
}
/* /*
* We give our sacrificial lamb high priority and access to * We give our sacrificial lamb high priority and access to
@ -294,7 +292,7 @@ static void __oom_kill_task(struct task_struct *p, const char *message)
force_sig(SIGKILL, p); force_sig(SIGKILL, p);
} }
static int oom_kill_task(struct task_struct *p, const char *message) static int oom_kill_task(struct task_struct *p)
{ {
struct mm_struct *mm; struct mm_struct *mm;
struct task_struct *g, *q; struct task_struct *g, *q;
@ -321,15 +319,15 @@ static int oom_kill_task(struct task_struct *p, const char *message)
return 1; return 1;
} while_each_thread(g, q); } while_each_thread(g, q);
__oom_kill_task(p, message); __oom_kill_task(p, 1);
/* /*
* kill all processes that share the ->mm (i.e. all threads), * kill all processes that share the ->mm (i.e. all threads),
* but are in a different thread group * but are in a different thread group.
*/ */
do_each_thread(g, q) { do_each_thread(g, q) {
if (q->mm == mm && q->tgid != p->tgid) if (q->mm == mm && q->tgid != p->tgid)
__oom_kill_task(q, message); __oom_kill_task(q, 1);
} while_each_thread(g, q); } while_each_thread(g, q);
return 0; return 0;
@ -346,21 +344,22 @@ static int oom_kill_process(struct task_struct *p, unsigned long points,
* its children or threads, just set TIF_MEMDIE so it can die quickly * its children or threads, just set TIF_MEMDIE so it can die quickly
*/ */
if (p->flags & PF_EXITING) { if (p->flags & PF_EXITING) {
__oom_kill_task(p, NULL); __oom_kill_task(p, 0);
return 0; return 0;
} }
printk(KERN_ERR "Out of Memory: Kill process %d (%s) score %li" printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
" and children.\n", p->pid, p->comm, points); message, p->pid, p->comm, points);
/* Try to kill a child first */ /* Try to kill a child first */
list_for_each(tsk, &p->children) { list_for_each(tsk, &p->children) {
c = list_entry(tsk, struct task_struct, sibling); c = list_entry(tsk, struct task_struct, sibling);
if (c->mm == p->mm) if (c->mm == p->mm)
continue; continue;
if (!oom_kill_task(c, message)) if (!oom_kill_task(c))
return 0; return 0;
} }
return oom_kill_task(p, message); return oom_kill_task(p);
} }
static BLOCKING_NOTIFIER_HEAD(oom_notify_list); static BLOCKING_NOTIFIER_HEAD(oom_notify_list);