Commit b097d5ed authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

futex: Get rid of the val2 conditional dance 



There is no point in checking which FUTEX operand treats the utime pointer
as 'val2' argument because that argument to do_futex() is only used by
exactly these operands.

So just handing it in unconditionally is not making any difference, but
removes a lot of pointless gunk.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210422194705.125957049@linutronix.de
parent cdf78db4

kernel/futex.c

+2 −14
Original line number Diff line number Diff line
@@ -3764,7 +3764,6 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, 
{

	struct timespec64 ts;

	ktime_t t, *tp = NULL;

	u32 val2 = 0;

	int cmd = op & FUTEX_CMD_MASK;



	if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
@@ -3784,15 +3783,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, 
			t = timens_ktime_to_host(CLOCK_MONOTONIC, t);

		tp = &t;

	}

	/*

	 * requeue parameter in 'utime' if cmd == FUTEX_*_REQUEUE_*.

	 * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP.

	 */

	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||

	    cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)

		val2 = (u32) (unsigned long) utime;



	return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);

	return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);

}



#ifdef CONFIG_COMPAT
@@ -3960,7 +3952,6 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val, 
{

	struct timespec64 ts;

	ktime_t t, *tp = NULL;

	int val2 = 0;

	int cmd = op & FUTEX_CMD_MASK;



	if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||
@@ -3978,11 +3969,8 @@ SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val, 
			t = timens_ktime_to_host(CLOCK_MONOTONIC, t);

		tp = &t;

	}

	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||

	    cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)

		val2 = (int) (unsigned long) utime;



	return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);

	return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);

}

#endif /* CONFIG_COMPAT_32BIT_TIME */