From: Oleg Nesterov <oleg@tv-sign.ru>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH rc1-mm] simplify exec from init's subthread
Date: Wed, 01 Feb 2006 22:43:25 +0300 [thread overview]
Message-ID: <43E10F5D.54A0B990@tv-sign.ru> (raw)
In-Reply-To: <200601312208.k0VM8hT4002399@shell0.pdx.osdl.net>
[ On top of "exec: allow init to exec from any thread.",
filename exec-allow-init-to-exec-from-any-thread.patch ]
I think it is enough to take tasklist_lock for reading while
changing child_reaper:
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: Oleg Nesterov <oleg@tv-sign.ru>
--- RC-1/fs/exec.c~ 2006-02-01 23:38:20.000000000 +0300
+++ RC-1/fs/exec.c 2006-02-02 00:39:40.000000000 +0300
@@ -616,6 +616,15 @@ static int de_thread(struct task_struct
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;
+
zap_other_threads(current);
read_unlock(&tasklist_lock);
@@ -660,23 +669,12 @@ static int de_thread(struct task_struct
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)) {
- write_lock(&tasklist_lock);
- child_reaper = current;
- zap_other_threads(current);
- write_unlock(&tasklist_lock);
- }
-
/*
* 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)
yield();
next parent reply other threads:[~2006-02-01 18:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200601312208.k0VM8hT4002399@shell0.pdx.osdl.net>
2006-02-01 19:43 ` Oleg Nesterov [this message]
2006-02-02 4:39 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43E10F5D.54A0B990@tv-sign.ru \
--to=oleg@tv-sign.ru \
--cc=akpm@osdl.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®