From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>,
Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@zip.com.au>,
Roland McGrath <roland@redhat.com>
Subject: Re: [patch] Re: Problem with exiting threads under NPTL
Date: Sun, 14 Dec 2003 23:28:47 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.58.0312142324250.15172@earth> (raw)
In-Reply-To: <Pine.LNX.4.58.0312141353220.1586@home.osdl.org>
here's yet another variant of the patch. Changes relative to yours:
- it sets zap_leader to 0 outside the critical section.
- it doesnt set leader to TASK_DEAD, exit_signal == -1 should really
protect it from sys_wait4() i believe.
- it sets 'p = leader' within the unlikely branch - slightly faster common
case.
the patch testbooted fine here.
Ingo
--- linux/kernel/exit.c.orig
+++ linux/kernel/exit.c
@@ -50,8 +50,11 @@ static void __unhash_process(struct task
void release_task(struct task_struct * p)
{
task_t *leader;
+ int zap_leader;
struct dentry *proc_dentry;
-
+
+repeat:
+ zap_leader = 0;
BUG_ON(p->state < TASK_ZOMBIE);
atomic_dec(&p->user->processes);
@@ -72,8 +75,16 @@ void release_task(struct task_struct * p
*/
leader = p->group_leader;
if (leader != p && thread_group_empty(leader) &&
- leader->state == TASK_ZOMBIE && leader->exit_signal != -1)
+ leader->state == TASK_ZOMBIE && leader->exit_signal != -1) {
do_notify_parent(leader, leader->exit_signal);
+ /*
+ * If we were the last child thread and the leader has
+ * exited already, and the leader's parent ignores SIGCHLD,
+ * then we are the one who should release the leader.
+ */
+ if (leader->exit_signal == -1)
+ zap_leader = 1;
+ }
p->parent->cutime += p->utime + p->cutime;
p->parent->cstime += p->stime + p->cstime;
@@ -88,6 +99,16 @@ void release_task(struct task_struct * p
proc_pid_flush(proc_dentry);
release_thread(p);
put_task_struct(p);
+
+ /*
+ * Do this outside the tasklist lock. The reference to the
+ * leader is safe. There's no recursion possible, since
+ * the leader of the leader is itself:
+ */
+ if (unlikely(zap_leader)) {
+ p = leader;
+ goto repeat;
+ }
}
/* we are using it only for SMP init */
next prev parent reply other threads:[~2003-12-14 22:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-14 5:25 Problem with exiting threads under NPTL Petr Vandrovec
2003-12-14 15:02 ` Martin Schlemmer
2003-12-14 19:38 ` [patch] " Ingo Molnar
2003-12-14 20:38 ` Linus Torvalds
2003-12-14 20:45 ` Linus Torvalds
2003-12-14 21:02 ` Ingo Molnar
2003-12-15 15:04 ` Jörn Engel
2003-12-14 21:06 ` Ingo Molnar
2003-12-14 22:10 ` Linus Torvalds
2003-12-14 22:17 ` Ingo Molnar
2003-12-14 22:32 ` Linus Torvalds
2003-12-15 23:04 ` Roland McGrath
2003-12-14 22:28 ` Ingo Molnar [this message]
2003-12-14 22:45 ` Linus Torvalds
2003-12-14 23:08 ` Ingo Molnar
2003-12-15 6:31 ` dan carpenter
2003-12-15 11:43 ` Ingo Molnar
2003-12-15 13:07 ` dan carpenter
2003-12-15 15:11 ` Linus Torvalds
2003-12-15 23:15 ` Roland McGrath
2003-12-15 8:54 ` Arjan van de Ven
2003-12-15 22:55 ` Roland McGrath
2003-12-15 23:06 ` Roland McGrath
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=Pine.LNX.4.58.0312142324250.15172@earth \
--to=mingo@elte.hu \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=roland@redhat.com \
--cc=torvalds@osdl.org \
--cc=vandrove@vc.cvut.cz \
/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;
as well as URLs for NNTP newsgroup(s).