Commit 0c1b2d78 authored Nov 05, 2015 by Oleg Nesterov Committed by Linus Torvalds Nov 05, 2015

mm/oom_kill: remove the wrong fatal_signal_pending() check in oom_kill_process()



The fatal_signal_pending() was added to suppress unnecessary "sharing same
memory" message, but it can't 100% help anyway because it can be
false-negative; SIGKILL can be already dequeued.

And worse, it can be false-positive due to exec or coredump.  exec is
mostly fine, but coredump is not.  It is possible that the group leader
has the pending SIGKILL because its sub-thread originated the coredump, in
this case we must not skip this process.

We could probably add the additional ->group_exit_task check but this
patch just removes the wrong check along with pr_info().

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Kyle Walker <kwalker@redhat.com>
Cc: Stanislav Kozina <skozina@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 09357814

mm/oom_kill.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -579,11 +579,7 @@ void oom_kill_process(struct oom_control oc, struct task_struct p,
		!(p->flags & PF_KTHREAD)) {
		if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
		continue;
		if (fatal_signal_pending(p))
		continue;

		pr_info("Kill process %d (%s) sharing same memory\n",
		task_pid_nr(p), p->comm);
		do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
		}
		rcu_read_unlock();

Admin message