093a8e8aec
taskstats_tgid_free() is called on copy_process's error path. This is wrong. IF (clone_flags & CLONE_THREAD) We should not clear ->signal->taskstats, current uses it, it probably has a valid accumulated info. ELSE taskstats_tgid_init() set ->signal->taskstats = NULL, there is nothing to free. Move the callsite to __exit_signal(). We don't need any locking, entire thread group is exiting, nobody should have a reference to soon to be released ->signal. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Shailabh Nagar <nagar@watson.ibm.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Jay Lan <jlan@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
81 lines
2.1 KiB
C
81 lines
2.1 KiB
C
/* taskstats_kern.h - kernel header for per-task statistics interface
|
|
*
|
|
* Copyright (C) Shailabh Nagar, IBM Corp. 2006
|
|
* (C) Balbir Singh, IBM Corp. 2006
|
|
*/
|
|
|
|
#ifndef _LINUX_TASKSTATS_KERN_H
|
|
#define _LINUX_TASKSTATS_KERN_H
|
|
|
|
#include <linux/taskstats.h>
|
|
#include <linux/sched.h>
|
|
#include <net/genetlink.h>
|
|
|
|
#ifdef CONFIG_TASKSTATS
|
|
extern kmem_cache_t *taskstats_cache;
|
|
extern struct mutex taskstats_exit_mutex;
|
|
|
|
static inline void taskstats_exit_free(struct taskstats *tidstats)
|
|
{
|
|
if (tidstats)
|
|
kmem_cache_free(taskstats_cache, tidstats);
|
|
}
|
|
|
|
static inline void taskstats_tgid_init(struct signal_struct *sig)
|
|
{
|
|
spin_lock_init(&sig->stats_lock);
|
|
sig->stats = NULL;
|
|
}
|
|
|
|
static inline void taskstats_tgid_alloc(struct signal_struct *sig)
|
|
{
|
|
struct taskstats *stats;
|
|
unsigned long flags;
|
|
|
|
stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
|
|
if (!stats)
|
|
return;
|
|
|
|
spin_lock_irqsave(&sig->stats_lock, flags);
|
|
if (!sig->stats) {
|
|
sig->stats = stats;
|
|
stats = NULL;
|
|
}
|
|
spin_unlock_irqrestore(&sig->stats_lock, flags);
|
|
|
|
if (stats)
|
|
kmem_cache_free(taskstats_cache, stats);
|
|
}
|
|
|
|
static inline void taskstats_tgid_free(struct signal_struct *sig)
|
|
{
|
|
if (sig->stats)
|
|
kmem_cache_free(taskstats_cache, sig->stats);
|
|
}
|
|
|
|
extern void taskstats_exit_alloc(struct taskstats **, unsigned int *);
|
|
extern void taskstats_exit_send(struct task_struct *, struct taskstats *, int, unsigned int);
|
|
extern void taskstats_init_early(void);
|
|
extern void taskstats_tgid_alloc(struct signal_struct *);
|
|
#else
|
|
static inline void taskstats_exit_alloc(struct taskstats **ptidstats, unsigned int *mycpu)
|
|
{}
|
|
static inline void taskstats_exit_free(struct taskstats *ptidstats)
|
|
{}
|
|
static inline void taskstats_exit_send(struct task_struct *tsk,
|
|
struct taskstats *tidstats,
|
|
int group_dead, unsigned int cpu)
|
|
{}
|
|
static inline void taskstats_tgid_init(struct signal_struct *sig)
|
|
{}
|
|
static inline void taskstats_tgid_alloc(struct signal_struct *sig)
|
|
{}
|
|
static inline void taskstats_tgid_free(struct signal_struct *sig)
|
|
{}
|
|
static inline void taskstats_init_early(void)
|
|
{}
|
|
#endif /* CONFIG_TASKSTATS */
|
|
|
|
#endif
|
|
|