diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-06 22:55:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-20 09:40:08 +0100 |
| commit | f24f22435dcc11389acc87e5586239c1819d217c (patch) | |
| tree | 6480bf006e24bca9aea68b34b577851f59042747 | |
| parent | futex: Split futex_mm_release() for exit/exec (diff) | |
| download | linux-f24f22435dcc11389acc87e5586239c1819d217c.tar.xz linux-f24f22435dcc11389acc87e5586239c1819d217c.zip | |
futex: Set task::futex_state to DEAD right after handling futex exit
Setting task::futex_state in do_exit() is rather arbitrarily placed for no
reason. Move it into the futex code.
Note, this is only done for the exit cleanup as the exec cleanup cannot set
the state to FUTEX_STATE_DEAD because the task struct is still in active
use.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191106224556.439511191@linutronix.de
| -rw-r--r-- | kernel/exit.c | 1 | ||||
| -rw-r--r-- | kernel/futex.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index cd893b530902..f3b8fa1b8945 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -837,7 +837,6 @@ void __noreturn do_exit(long code) * Make sure we are holding no locks: */ debug_check_no_locks_held(); - futex_exit_done(tsk); if (tsk->io_context) exit_io_context(tsk); diff --git a/kernel/futex.c b/kernel/futex.c index 909e4d3c3099..426dd71e170d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -3682,6 +3682,7 @@ void futex_exec_release(struct task_struct *tsk) void futex_exit_release(struct task_struct *tsk) { futex_exec_release(tsk); + futex_exit_done(tsk); } long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, |