Commit 1434261c authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

[PATCH] simplify exec from init's subthread

I think it is enough to take tasklist_lock for reading while changing

	Reparenting needs write_lock(tasklist_lock)

	Only one thread in a thread group can do exec()

	sighand->siglock garantees that get_signal_to_deliver()
	will not see a stale value of child_reaper.

This means that we can change child_reaper earlier, without calling
zap_other_threads() twice.

"child_reaper = current" is a NOOP when init does exec from main thread, we
don't care.
Signed-off-by: default avatarOleg Nesterov <>
Acked-by: default avatar"Eric W. Biederman" <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent fef23e7f
......@@ -616,6 +616,15 @@ static int de_thread(struct task_struct *tsk)
kmem_cache_free(sighand_cachep, newsighand);
return -EAGAIN;
* child_reaper ignores SIGKILL, change it now.
* Reparenting needs write_lock on tasklist_lock,
* so it is safe to do it under read_lock.
if (unlikely(current->group_leader == child_reaper))
child_reaper = current;
......@@ -660,23 +669,12 @@ static int de_thread(struct task_struct *tsk)
struct dentry *proc_dentry1, *proc_dentry2;
unsigned long ptrace;
leader = current->group_leader;
* If our leader is the child_reaper become
* the child_reaper and resend SIGKILL signal.
if (unlikely(leader == child_reaper)) {
child_reaper = current;
* Wait for the thread group leader to be a zombie.
* It should already be zombie at this point, most
* of the time.
leader = current->group_leader;
while (leader->exit_state != EXIT_ZOMBIE)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment