proc: turn signal_struct->count into "int nr_threads"
Subsystems (3)
PATCH 1/1 proc: turn signal_struct->count into "int nr_threads"
No functional changes, just s/atomic_t count/int nr_threads/.
With the recent changes this counter has a single user, get_nr_threads() And, none of its callers need the really accurate number of threads, not to mention each caller obviously races with fork/exit. It is only used to report this value to the user-space, except first_tid() uses it to avoid the unnecessary while_each_thread() loop in the unlikely case.
It is a bit sad we need a word in struct signal_struct for this, perhaps we can change get_nr_threads() to approximate the number of threads using signal->live and kill ->nr_threads later.
---
include/linux/sched.h | 4 ++-- include/linux/init_task.h | 2 +- kernel/exit.c | 5 +---- kernel/fork.c | 8 ++++---- 4 files changed, 8 insertions(+), 11 deletions(-)
include/linux/sched.h renamed from include/linux/sched.h~14_S_COUNT_NR_THREADS +2 -2
@@ -518,8 +518,8 @@ struct thread_group_cputimer {*/ struct signal_struct {atomic_t sigcnt; -atomic_t count;atomic_t live; +int nr_threads;wait_queue_head_t wait_chldexit;/* for wait4() */
@@ -2150,7 +2150,7 @@ extern bool current_is_single_threaded(vstatic inline int get_nr_threads (struct task_struct *tsk) { -return atomic_read (&tsk->signal->count); +return tsk->signal->nr_threads; }/* de_thread depends on thread_group_leader not being a pid based check */
include/linux/init_task.h renamed from include/linux/init_task.h~14_S_COUNT_NR_THREADS +1 -1
@@ -16,7 +16,7 @@ extern struct files_struct init_files;extern struct fs_struct init_fs;#define INIT_SIGNALS (sig) { \ - .count = ATOMIC_INIT(1), \ + .nr_threads = 1, \ .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\ .shared_pending = { \ .list = LIST_HEAD_INIT(sig.shared_pending.list), \
kernel/exit.c renamed from kernel/exit.c~14_S_COUNT_NR_THREADS +1 -4
@@ -84,14 +84,10 @@ static void __exit_signal(struct task_ststruct sighand_struct *sighand;struct tty_struct *uninitialized_var (tty ); -BUG_ON (!sig); -BUG_ON (!atomic_read (&sig->count)); - sighand =rcu_dereference_check (tsk->sighand,rcu_read_lock_held () ||lockdep_is_held (&tasklist_lock));spin_lock (&sighand->siglock); -atomic_dec (&sig->count);posix_cpu_timers_exit (tsk);if (group_dead) {
@@ -131,6 +127,7 @@ static void __exit_signal(struct task_st sig->sum_sched_runtime += tsk->se.sum_exec_runtime; } + sig->nr_threads--;__unhash_process (tsk, group_dead);/*
kernel/fork.c renamed from kernel/fork.c~14_S_COUNT_NR_THREADS +4 -4
@@ -881,9 +881,9 @@ static int copy_signal(unsigned long cloif (!sig)return -ENOMEM ; -atomic_set (&sig->sigcnt,1 ); -atomic_set (&sig->count,1 ); + sig->nr_threads =1 ;atomic_set (&sig->live,1 ); +atomic_set (&sig->sigcnt,1 );init_waitqueue_head (&sig->wait_chldexit);if (clone_flags &CLONE_NEWPID ) sig->flags |=SIGNAL_UNKILLABLE ;
@@ -1257,9 +1257,9 @@ static struct task_struct *copy_process( }if (clone_flags &CLONE_THREAD ) { -atomic_inc (¤t->signal->sigcnt); -atomic_inc (¤t->signal->count); + current->signal->nr_threads++;atomic_inc (¤t->signal->live); +atomic_inc (¤t->signal->sigcnt); p->group_leader = current->group_leader;list_add_tail_rcu (&p->thread_group, &p->group_leader->thread_group); }
Quoted 2 lines · Oleg Nesterov
No functional changes, just s/atomic_t count/int nr_threads/.
Argh, I forgot to send "[PATCH 0/1]", please see below...
[PATCH -mm 0/1] proc: turn signal_struct->count into "int nr_threads"
Depends on
[PATCH -mm 1/2] proc_sched_show_task: use get_nr_threads()
[PATCH -mm 2/2] keyctl_session_to_parent: use thread_group_empty() to check singlethreadness
and on top of the trivial
[PATCH -mm] signals-clear-signal-tty-when-the-last-thread-exits.fix
I did "make allyesconfig" to test this change, but the compilation failed because of unrelated bugs, and of course "count" is not really grepable :/
However,
$ grep -nr --include=*.[ch] -E 'sig\w*->count' */ | grep -Ev 'sigh(and)?->count' kernel/fork.c:827: atomic_set(&sig->count, 1);
and this "sig" above is in fact sighand.
Fortunately, if I missed some user of signal->count the necessary fix will be really trivial. And I bet in this case that user should be wrong anyway.
Oleg.
Quoted 3 lines
It is a bit sad we need a word in struct
signal_structfor this, perhaps we can changeget_nr_threads()to approximate the number of threads usingsignal->liveand kill ->nr_threads later.
Agreed.
Thanks,
Roland