redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

futex: Simplify fixup_pi_state_owner() 

commit f2dac39d93 upstream

Too many gotos already and an upcoming fix would make it even more
unreadable.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
Thomas Gleixner 2021-01-19 16:26:38 +01:00 committed by Greg Kroah-Hartman
parent a3155c362c
commit 55ea172ce3
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
kernel/futex.c
View File

@ -2462,18 +2462,13 @@ static void unqueue_me_pi(struct futex_q *q)
spin_unlock(q->lock_ptr);
}
static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
struct task_struct *argowner)
static int __fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
struct task_struct *argowner)
{
u32 uval, uninitialized_var(curval), newval, newtid;
struct futex_pi_state *pi_state = q->pi_state;
u32 uval, uninitialized_var(curval), newval;
struct task_struct *oldowner, *newowner;
u32 newtid;
int ret, err = 0;
lockdep_assert_held(q->lock_ptr);
raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
int err = 0;
oldowner = pi_state->owner;
@ -2507,14 +2502,12 @@ retry:
* We raced against a concurrent self; things are
* already fixed up. Nothing to do.
*/
ret = 0;
goto out_unlock;
return 0;
}
if (__rt_mutex_futex_trylock(&pi_state->pi_mutex)) {
/* We got the lock. pi_state is correct. Tell caller. */
ret = 1;
goto out_unlock;
return 1;
}
/*
@ -2541,8 +2534,7 @@ retry:
* We raced against a concurrent self; things are
* already fixed up. Nothing to do.
*/
ret = 1;
goto out_unlock;
return 1;
}
newowner = argowner;
}
@ -2573,7 +2565,6 @@ retry:
* itself.
*/
pi_state_update_owner(pi_state, newowner);
raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
return argowner == current;
@ -2596,17 +2587,16 @@ handle_err:
switch (err) {
case -EFAULT:
ret = fault_in_user_writeable(uaddr);
err = fault_in_user_writeable(uaddr);
break;
case -EAGAIN:
cond_resched();
ret = 0;
err = 0;
break;
default:
WARN_ON_ONCE(1);
ret = err;
break;
}
@ -2616,17 +2606,26 @@ handle_err:
/*
* Check if someone else fixed it for us:
*/
if (pi_state->owner != oldowner) {
ret = argowner == current;
goto out_unlock;
}
if (pi_state->owner != oldowner)
return argowner == current;
if (ret)
goto out_unlock;
/* Retry if err was -EAGAIN or the fault in succeeded */
if (!err)
goto retry;
goto retry;
return err;
}
out_unlock:
static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
struct task_struct *argowner)
{
struct futex_pi_state *pi_state = q->pi_state;
int ret;
lockdep_assert_held(q->lock_ptr);
raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
ret = __fixup_pi_state_owner(uaddr, q, argowner);
raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
return ret;
}