state/exit_state cleanups (Was: Remove unused variable ret from sync_thread_master())
Subsystems (4)
cover state/exit_state cleanups (Was: Remove unused variable ret from sync_thread_master())
Quoted 7 lines · Oleg Nesterov
Quoted 5 lines · Peter Zijlstra
We have to put in something...
BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));
Quoted 7 lines
Quoted 2 lines
However, since we always set it together with
TASK_UNINTERUPTIBLEuserspace shouldn't actually ever see the I thing.OOPS. I didn't know that
get_task_state()does &=TASK_REPORT. So it can never report anything >EXIT_DEAD.Perhaps we should change
BUILD_BUG_ON()and shrinktask_state_array?
Seriously, imho this looks confusing enough and deserves a cleanup.
As for "nobody should use exit_state". I'll try to recheck, but iirc we already discussed this... do you remember any reason why schedule_debug() can't check prev->state == TASK_DEAD instead of ->exit_state?
Note that ->exit_state is not exactly right, it is set by exit_notify() but in_atomic_preempt_off() should be only ignored when the task does the last schedule() in TASK_DEAD.
Oleg.
PATCH 2/3 fork: no need to initialize child->exit_state
A zombie task obviously can't fork(), remove the unnecessary initialization of child->exit_state. It is zero anyway after dup_task_struct().
Note: copy_process() is huge and it has a lot of chaotic initializations, probably it makes sense to move them into the new helper called by dup_task_struct().
--- kernel/fork.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
kernel/fork.c +1 -3
@@ -1405,13 +1405,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->tgid = p->pid; } - p->pdeath_signal =0 ; - p->exit_state =0 ; - p->nr_dirtied =0 ; p->nr_dirtied_pause =128 >> (PAGE_SHIFT -10 ); p->dirty_paused_when =0 ; + p->pdeath_signal =0 ;INIT_LIST_HEAD (&p->thread_group); p->task_works =NULL ;
Signature · 1 line
1.5.5.1
PATCH 1/3 proc: cleanup/simplify get_task_state/task_state_array
In reply to Oleg Nesterovget_task_state() and task_state_array[] look confusing and suboptimal, it is not clear what it can actually report to user-space and task_state_array[] blows .data for no reason.
1. state = (tsk->state & TASK_REPORT) | tsk->exit_state is not clear. TASK_REPORT is self-documenting but it is not clear what ->exit_state can add.
Move the potential exit_state's (EXIT_ZOMBIE and EXIT_DEAD) into TASK_REPORT and use it to calculate the final result.
2. With the change above it is obvious that task_state_array[] has the unused entries just to make BUILD_BUG_ON() happy.
Change this BUILD_BUG_ON() to use TASK_REPORT rather than TASK_STATE_MAX and shrink task_state_array[].
3. Turn the "while (state)" loop into fls(state).
--- fs/proc/array.c | 15 +++------------ include/linux/sched.h | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-)
fs/proc/array.c +3 -12
@@ -140,24 +140,15 @@ static const char * const task_state_array[] = {"t (tracing stop)" ,/* 8 */ "Z (zombie)" ,/* 16 */ "X (dead)", /* 32 */ -"x (dead)" ,/* 64 */ -"K (wakekill)" ,/* 128 */ -"W (waking)" ,/* 256 */ - "P (parked)", /* 512 */ };static inline const char *get_task_state (struct task_struct *tsk) { -unsigned int state = (tsk->state &TASK_REPORT ) | tsk->exit_state; -const char *const *p = &task_state_array[0 ]; +unsigned int state = (tsk->state | tsk->exit_state) &TASK_REPORT ; -BUILD_BUG_ON (1 +ilog2 (TASK_STATE_MAX ) !=ARRAY_SIZE (task_state_array)); +BUILD_BUG_ON (1 +ilog2 (TASK_REPORT ) !=ARRAY_SIZE (task_state_array)-1 ); -while (state) { - p++; - state >>=1 ; - } -return *p; +return task_state_array[fls (state)]; } static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
include/linux/sched.h +1 -1
@@ -163,7 +163,7 @@ extern char ___assert_task_state[1 - 2*!!(/* get_task_state() */ #define TASK_REPORT (TASK_RUNNING | TASK_INTERRUPTIBLE | \ TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ - __TASK_TRACED) + __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)#define task_is_traced (task) ((task->state & __TASK_TRACED) != 0)#define task_is_stopped (task) ((task->state & __TASK_STOPPED) != 0)
Signature · 1 line
1.5.5.1
PATCH 3/3 exit_state: kill task_is_dead()
In reply to Oleg Nesterovtask_is_dead() has no users since commit 43e13cc107cf "cred: remove task_is_dead() from __task_cred() validation", and nobody except exit.c should rely on ->exit_state (we still have the users which should be changed).
--- include/linux/sched.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
include/linux/sched.h +0 -1
@@ -167,7 +167,6 @@ extern char ___assert_task_state[1 - 2*!!(#define task_is_traced (task) ((task->state & __TASK_TRACED) != 0)#define task_is_stopped (task) ((task->state & __TASK_STOPPED) != 0) -#define task_is_dead (task) ((task)->exit_state != 0)#define task_is_stopped_or_traced (task) \ ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)#define task_contributes_to_load (task) \
Signature · 1 line
1.5.5.1
Quoted 16 lines · Oleg Nesterov
Quoted 7 lines · Oleg Nesterov
Quoted 5 lines · Peter Zijlstra
We have to put in something...
BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));Quoted 7 lines
Quoted 2 lines
However, since we always set it together with
TASK_UNINTERUPTIBLEuserspace shouldn't actually ever see the I thing.OOPS. I didn't know that
get_task_state()does &=TASK_REPORT. So it can never report anything >EXIT_DEAD.Perhaps we should change
BUILD_BUG_ON()and shrinktask_state_array?
Quoted 7 lines
Seriously, imho this looks confusing enough and deserves a cleanup.
As for "nobody should use
exit_state". I'll try to recheck, but iirc we already discussed this... do you remember any reason whyschedule_debug()can't checkprev->state==TASK_DEADinstead of ->exit_state?
I have no such memories :/ but a quick test shows that such a kernel does boot without issue.
Quoted 3 lines
Note that ->exit_state is not exactly right, it is set by
exit_notify()butin_atomic_preempt_off()should be only ignored when the task does the lastschedule()inTASK_DEAD.
Agreed.
For these patches:
Peter Zijlstra
maintainerQuoted 3 lines · Peter Zijlstra
For these patches:
Acked-by Peter Zijlstra <[email protected]>
On that, I'll just pick them up and stuff them through the scheduler tree, its mostly sched related anyway.
cover sched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
In reply to Peter ZijlstraQuoted 10 lines · Peter Zijlstra
Quoted 5 lines · Oleg Nesterov
As for "nobody should use
exit_state". I'll try to recheck, but iirc we already discussed this... do you remember any reason whyschedule_debug()can't checkprev->state==TASK_DEADinstead of ->exit_state?I have no such memories :/ but a quick test shows that such a kernel does boot without issue.
probably my memory fools me. OK, it seems that you agree with this change, hopefully we both can't be wrong ;)
Quoted 1 line
Acked-by Peter Zijlstra <[email protected]>
Thanks! And since picked this series, perhaps you can also queue this one?
Oleg.
PATCH 1/1 sched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
schedule_debug() ignores in_atomic() if prev->exit_state != 0. This is not what we want, ->exit_state is set by exit_notify() but we should complain until the task does the last schedule() in TASK_DEAD.
See also 7407251a0e2e "PF_DEAD cleanup", I think this ancient commit explains why schedule() had to rely on ->exit_state, until that commit exit_notify() disabled preemption and set PF_DEAD which was used to detect the exiting task.
--- kernel/sched/core.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
kernel/sched/core.c +3 -3
@@ -2287,10 +2287,10 @@ static inline void schedule_debug(struct task_struct *prev) {/* * Test if we are atomic. Since do_exit() needs to call into -* schedule() atomically, we ignore that path for now. -* Otherwise, whine if we are scheduling when we should not be. +* schedule() atomically, we ignore that path. Otherwise whine +* if we are scheduling when we should not. */ -if (unlikely (in_atomic_preempt_off () && !prev->exit_state)) +if (unlikely (in_atomic_preempt_off () && prev->state !=TASK_DEAD ))__schedule_bug (prev);rcu_sleep_check ();
Signature · 1 line
1.5.5.1
Peter Zijlstra
maintainerRe: [PATCH 0/1] sched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
In reply to Oleg NesterovQuoted 2 lines · Oleg Nesterov
Thanks! And since picked this series, perhaps you can also queue this one?
Done; if there's something fishy we're bound to hit it before .14 (I hope).
tip-bot for Oleg Nesterov
merge bot[tip:sched/core] tasks/exit: Remove unused task_is_dead() method
In reply to Oleg Nesterovtasks/exit: Remove unused task_is_dead() method
Commit-ID: 86506a99a62400e9f7b7d1344bcc9ea235faf98f Gitweb: http://git.kernel.org/tip/86506a99a62400e9f7b7d1344bcc9ea235faf98f Author: Oleg Nesterov <[email protected]> AuthorDate: Wed, 13 Nov 2013 15:36:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 13:50:52 +0100
tasks/exit: Remove unused task_is_dead() method
task_is_dead() has no users since commit 43e13cc107cf ("cred: remove task_is_dead() from __task_cred() validation"), and nobody except exit.c should rely on ->exit_state (we still have the users which should be changed).
--- include/linux/sched.h | 1 - 1 file changed, 1 deletion(-)
include/linux/sched.h +0 -1
@@ -168,7 +168,6 @@ extern char ___assert_task_state[1 - 2*!!(#define task_is_traced (task) ((task->state & __TASK_TRACED) != 0)#define task_is_stopped (task) ((task->state & __TASK_STOPPED) != 0) -#define task_is_dead (task) ((task)->exit_state != 0)#define task_is_stopped_or_traced (task) \ ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)#define task_contributes_to_load (task) \
tip-bot for Oleg Nesterov
merge bot[tip:sched/core] tasks/fork: Remove unnecessary child->exit_state
In reply to Oleg Nesterovtasks/fork: Remove unnecessary child->exit_state
Commit-ID: bb8cbbfee68518796df4050868e5b0f5ad078f9f Gitweb: http://git.kernel.org/tip/bb8cbbfee68518796df4050868e5b0f5ad078f9f Author: Oleg Nesterov <[email protected]> AuthorDate: Wed, 13 Nov 2013 15:36:12 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 13:50:50 +0100
tasks/fork: Remove unnecessary child->exit_state
A zombie task obviously can't fork(), remove the unnecessary initialization of child->exit_state. It is zero anyway after dup_task_struct().
Note: copy_process() is huge and it has a lot of chaotic initializations, probably it makes sense to move them into the new helper called by dup_task_struct().
--- kernel/fork.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/fork.c +1 -3
@@ -1402,13 +1402,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->tgid = p->pid; } - p->pdeath_signal =0 ; - p->exit_state =0 ; - p->nr_dirtied =0 ; p->nr_dirtied_pause =128 >> (PAGE_SHIFT -10 ); p->dirty_paused_when =0 ; + p->pdeath_signal =0 ;INIT_LIST_HEAD (&p->thread_group); p->task_works =NULL ;
tip-bot for Oleg Nesterov
merge bot[tip:sched/core] sched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
In reply to Oleg Nesterovsched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
Commit-ID: 192301e70af3f6803c6354a464ebfa742da738ae Gitweb: http://git.kernel.org/tip/192301e70af3f6803c6354a464ebfa742da738ae Author: Oleg Nesterov <[email protected]> AuthorDate: Wed, 13 Nov 2013 16:45:38 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 13:50:53 +0100
sched: Check TASK_DEAD rather than EXIT_DEAD in schedule_debug()
schedule_debug() ignores in_atomic() if prev->exit_state != 0. This is not what we want, ->exit_state is set by exit_notify() but we should complain until the task does the last schedule() in TASK_DEAD.
See also 7407251a0e2e "PF_DEAD cleanup", I think this ancient commit explains why schedule() had to rely on ->exit_state, until that commit exit_notify() disabled preemption and set PF_DEAD which was used to detect the exiting task.
--- kernel/sched/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/core.c +3 -3
@@ -2414,10 +2414,10 @@ static inline void schedule_debug(struct task_struct *prev) {/* * Test if we are atomic. Since do_exit() needs to call into -* schedule() atomically, we ignore that path for now. -* Otherwise, whine if we are scheduling when we should not be. +* schedule() atomically, we ignore that path. Otherwise whine +* if we are scheduling when we should not. */ -if (unlikely (in_atomic_preempt_off () && !prev->exit_state)) +if (unlikely (in_atomic_preempt_off () && prev->state !=TASK_DEAD ))__schedule_bug (prev);rcu_sleep_check ();