diff mbox series

[06/12] futex: Set task::futex_state to DEAD right after handling futex exit

Message ID 20210201100143.2028618-7-lee.jones@linaro.org
State Superseded
Headers show
Series Futex back-port from v4.14 | expand

Commit Message

Lee Jones Feb. 1, 2021, 10:01 a.m. UTC 
From: Thomas Gleixner <tglx@linutronix.de>


commit f24f22435dcc11389acc87e5586239c1819d217c upstream.

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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 kernel/exit.c  | 1 -
 kernel/futex.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

-- 
2.25.1
diff mbox series

Patch

diff --git a/kernel/exit.c b/kernel/exit.c
index b65285f5ee0c9..e87ab2ec654bc 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -867,7 +867,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 902ce420c4ba0..e8322c3208a44 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3290,6 +3290,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,