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

signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()

Browse Source 
Change oom_kill_task() to use do_send_sig_info(SEND_SIG_FORCED) instead
of force_sig(SIGKILL).  With the recent changes we do not need force_ to
kill the CLONE_NEWPID tasks.

And this is more correct.  force_sig() can race with the exiting thread
even if oom_kill_task() checks p->mm != NULL, while
do_send_sig_info(group => true) kille the whole process.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.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>
This commit is contained in:
Oleg Nesterov 2012-03-23 15:02:45 -07:00 committed by Linus Torvalds
parent def8cf7256
commit d2d393099d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/oom_kill.c
View File

@ -521,11 +521,11 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
pr_err("Kill process %d (%s) sharing same memory\n", pr_err("Kill process %d (%s) sharing same memory\n",
task_pid_nr(p), p->comm); task_pid_nr(p), p->comm);
task_unlock(p); task_unlock(p);
force_sig(SIGKILL, p); do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
} }
set_tsk_thread_flag(victim, TIF_MEMDIE); set_tsk_thread_flag(victim, TIF_MEMDIE);
force_sig(SIGKILL, victim); do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
} }
#undef K #undef K