On Tue, 2011-01-04 at 20:06 +0100, Mike Galbraith wrote:
> On Tue, 2011-01-04 at 15:57 +0100, Oleg Nesterov wrote:
>
> > > diff --git a/kernel/fork.c b/kernel/fork.c
> > > index b6f2475..0672444 100644
> > > --- a/kernel/fork.c
> > > +++ b/kernel/fork.c
> > > @@ -1317,7 +1317,7 @@ bad_fork_cleanup_mm:
> > > }
> > > bad_fork_cleanup_signal:
> > > if (!(clone_flags & CLONE_THREAD))
> > > - free_signal_struct(p->signal);
> > > + put_signal_struct(p->signal);
> >
> > Well, free_signal_struct() was correct. Without CLONE_THREAD
> > sig->sigcnt must be equal to 1.
>
> Yeah, it was only about the autogroup reference leak.
>
> > But yes, autogroup puts sched_autogroup_exit() into put_signal_struct(),
> > so this patch looks fine.
> >
> > Although I must admit, to me it would be more clean to simply move
> > sched_autogroup_exit() from put_signal_struct() into free_signal_struct()
> > instead.
>
> OK, I'll send a move it patchlet.
sched: move sched_autogroup_exit() to free_signal_struct()
Per Oleg's suggestion, undo fork failure free/put_signal_struct change,
and move sched_autogroup_exit() to free_signal_struct() instead.
Signed-off-by: Mike Galbraith <efault@xxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
---
kernel/fork.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux-2.6/kernel/fork.c
===================================================================
--- linux-2.6.orig/kernel/fork.c
+++ linux-2.6/kernel/fork.c
@@ -169,15 +169,14 @@ EXPORT_SYMBOL(free_task);
static inline void free_signal_struct(struct signal_struct *sig)
{
taskstats_tgid_free(sig);
+ sched_autogroup_exit(sig);
kmem_cache_free(signal_cachep, sig);
}
static inline void put_signal_struct(struct signal_struct *sig)
{
- if (atomic_dec_and_test(&sig->sigcnt)) {
- sched_autogroup_exit(sig);
+ if (atomic_dec_and_test(&sig->sigcnt))
free_signal_struct(sig);
- }
}
void __put_task_struct(struct task_struct *tsk)
@@ -1318,7 +1317,7 @@ bad_fork_cleanup_mm:
}
bad_fork_cleanup_signal:
if (!(clone_flags & CLONE_THREAD))
- put_signal_struct(p->signal);
+ free_signal_struct(p->signal);
bad_fork_cleanup_sighand:
__cleanup_sighand(p->sighand);
bad_fork_cleanup_fs:
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|