diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2015-11-05 18:47:54 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-07-08 14:08:55 +0200 |
| commit | 3feac374ea522799fa5470b4f6d8d577b5490974 (patch) | |
| tree | 96d2e05006b9ede54cc094ac474a6db87748fd7a /mm | |
| parent | f028aedfcfd2e2bb98921b98d3ae183387ab8fed (diff) | |
mm/oom_kill.c: suppress unnecessary "sharing same memory" message
oom_kill_process() sends SIGKILL to other thread groups sharing victim's
mm. But printing
"Kill process %d (%s) sharing same memory\n"
lines makes no sense if they already have pending SIGKILL. This patch
reduces the "Kill process" lines by printing that line with info level
only if SIGKILL is not pending.
Change-Id: I5eeffd256929781863cf4ac0691e22fb24be46f3
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index ba516e546..4b7e9037d 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -626,9 +626,11 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, !(p->flags & PF_KTHREAD)) { if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) continue; + if (fatal_signal_pending(p)) + continue; task_lock(p); /* Protect ->comm from prctl() */ - pr_err("Kill process %d (%s) sharing same memory\n", + pr_info("Kill process %d (%s) sharing same memory\n", task_pid_nr(p), p->comm); task_unlock(p); do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true); |