taskstats: cleanup ->signal->stats allocation
Subsystems (4)
PATCH 2/2 taskstats: cleanup ->signal->stats allocation
Allocate ->signal->stats on demand in taskstats_exit(), this allows us to remove taskstats_tgid_alloc() (the last non-trivial inline) from taskstat's public interface.
Signed-off-by Oleg Nesterov <[email protected]>
include/linux/taskstats_kern.h | 24 ------------------------ kernel/fork.c | 1 - kernel/taskstats.c | 26 +++++++++++++++++++++++++- 3 files changed, 25 insertions(+), 26 deletions(-)
include/linux/taskstats_kern.h renamed from include/linux/taskstats_kern.h~4_fork +0 -24
@@ -20,28 +20,6 @@ static inline void taskstats_tgid_init(s sig->stats =NULL ; } -static inline void taskstats_tgid_alloc (struct task_struct *tsk) -{ -struct signal_struct *sig = tsk->signal; -struct taskstats *stats; - -if (sig->stats !=NULL ) -return ; - -/* No problem if kmem_cache_zalloc() fails */ - stats =kmem_cache_zalloc (taskstats_cache,SLAB_KERNEL ); - -spin_lock_irq (&tsk->sighand->siglock); -if (!sig->stats) { - sig->stats = stats; - stats =NULL ; - } -spin_unlock_irq (&tsk->sighand->siglock); - -if (stats) -kmem_cache_free (taskstats_cache, stats); -} -static inline void taskstats_tgid_free (struct signal_struct *sig) {if (sig->stats)
@@ -55,8 +33,6 @@ static inline void taskstats_exit(struct {}static inline void taskstats_tgid_init (struct signal_struct *sig) {} -static inline void taskstats_tgid_alloc (struct task_struct *tsk) -{}static inline void taskstats_tgid_free (struct signal_struct *sig) {}static inline void taskstats_init_early (void )
kernel/fork.c renamed from kernel/fork.c~4_fork +0 -1
@@ -830,7 +830,6 @@ static inline int copy_signal(unsigned lif (clone_flags &CLONE_THREAD ) {atomic_inc (¤t->signal->count);atomic_inc (¤t->signal->live); -taskstats_tgid_alloc (current);return 0 ; } sig =kmem_cache_alloc (signal_cachep,GFP_KERNEL );
kernel/taskstats.c renamed from kernel/taskstats.c~4_fork +25 -1
@@ -417,6 +417,30 @@ err:return rc; } +static struct taskstats *taskstats_tgid_alloc (struct task_struct *tsk) +{ +struct signal_struct *sig = tsk->signal; +struct taskstats *stats; + +if (sig->stats ||thread_group_empty (tsk)) + goto ret; + +/* No problem if kmem_cache_zalloc() fails */ + stats =kmem_cache_zalloc (taskstats_cache,SLAB_KERNEL ); + +spin_lock_irq (&tsk->sighand->siglock); +if (!sig->stats) { + sig->stats = stats; + stats =NULL ; + } +spin_unlock_irq (&tsk->sighand->siglock); + +if (stats) +kmem_cache_free (taskstats_cache, stats); +ret: +return sig->stats; +} +/* Send pid data out on exit */ void taskstats_exit (struct task_struct *tsk,int group_dead) {
@@ -438,7 +462,7 @@ void taskstats_exit(struct task_struct * size =nla_total_size (sizeof (u32)) +nla_total_size (sizeof (struct taskstats )) +nla_total_size (0 ); - is_thread_group = (tsk->signal->stats !=NULL ); + is_thread_group = !!taskstats_tgid_alloc (tsk);if (is_thread_group) {/* PID + STATS + TGID + STATS */ size =2 * size;