Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74937389 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

futex: Split futex_mm_release() for exit/exec 



commit 150d71584b12809144b8145b817e83b81158ae5f upstream.

To allow separate handling of the futex exit state in the futex exit code
for exit and exec, split futex_mm_release() into two functions and invoke
them from the corresponding exit/exec_mm_release() callsites.

Preparatory only, no functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191106224556.332094221@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 93d2eb40

include/linux/futex.h

+4 −2
Original line number Diff line number Diff line
@@ -98,13 +98,15 @@ static inline void futex_exit_done(struct task_struct *tsk) 
	tsk->futex_state = FUTEX_STATE_DEAD;

}



void futex_mm_release(struct task_struct *tsk);

void futex_exit_release(struct task_struct *tsk);

void futex_exec_release(struct task_struct *tsk);



long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,

	      u32 __user *uaddr2, u32 val2, u32 val3);

#else

static inline void futex_init_task(struct task_struct *tsk) { }

static inline void futex_mm_release(struct task_struct *tsk) { }

static inline void futex_exit_done(struct task_struct *tsk) { }

static inline void futex_exit_release(struct task_struct *tsk) { }

static inline void futex_exec_release(struct task_struct *tsk) { }

#endif

#endif

kernel/fork.c

+2 −3
Original line number Diff line number Diff line
@@ -889,9 +889,6 @@ static int wait_for_vfork_done(struct task_struct *child, 
 */

static void mm_release(struct task_struct *tsk, struct mm_struct *mm)

{

	/* Get rid of any futexes when releasing the mm */

	futex_mm_release(tsk);



	uprobe_free_utask(tsk);



	/* Get rid of any cached register state */
@@ -926,11 +923,13 @@ static void mm_release(struct task_struct *tsk, struct mm_struct *mm) 


void exit_mm_release(struct task_struct *tsk, struct mm_struct *mm)

{

	futex_exit_release(tsk);

	mm_release(tsk, mm);

}



void exec_mm_release(struct task_struct *tsk, struct mm_struct *mm)

{

	futex_exec_release(tsk);

	mm_release(tsk, mm);

}

kernel/futex.c

+6 −1
Original line number Diff line number Diff line
@@ -3234,7 +3234,7 @@ static void exit_robust_list(struct task_struct *curr) 
				   curr, pip);

}



void futex_mm_release(struct task_struct *tsk)

void futex_exec_release(struct task_struct *tsk)

{

	if (unlikely(tsk->robust_list)) {

		exit_robust_list(tsk);
@@ -3252,6 +3252,11 @@ void futex_mm_release(struct task_struct *tsk) 
		exit_pi_state_list(tsk);

}



void futex_exit_release(struct task_struct *tsk)

{

	futex_exec_release(tsk);

}



long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,

		u32 __user *uaddr2, u32 val2, u32 val3)

{