linux-kernel - Re: [PATCH v2 3/4] mutex: Try to acquire mutex only if it is unlocked

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 11 Jun 2014 21:28:33 -0400
From:	"Long, Wai Man" <waiman.long@...com>
To:	Jason Low <jason.low2@...com>, mingo@...nel.org,
	peterz@...radead.org, tglx@...utronix.de, akpm@...ux-foundation.org
CC:	linux-kernel@...r.kernel.org, tim.c.chen@...ux.intel.com,
	paulmck@...ux.vnet.ibm.com, rostedt@...dmis.org, davidlohr@...com,
	scott.norton@...com, aswin@...com
Subject: Re: [PATCH v2 3/4] mutex: Try to acquire mutex only if it is unlocked


On 6/11/2014 2:37 PM, Jason Low wrote:
> Upon entering the slowpath in __mutex_lock_common(), we try once more to
> acquire the mutex. We only try to acquire if (lock->count >= 0). However,
> what we actually want here is to try to acquire if the mutex is unlocked
> (lock->count == 1).
>    
> This patch changes it so that we only try-acquire the mutex upon entering
> the slowpath if it is unlocked, rather than if the lock count is non-negative.
> This helps further reduce unnecessary atomic xchg() operations.
>
> Furthermore, this patch uses !mutex_is_locked(lock) to do the initial
> checks for if the lock is free rather than directly calling atomic_read()
> on the lock->count, in order to improve readability.
>
> Signed-off-by: Jason Low <jason.low2@...com>
> ---
>   kernel/locking/mutex.c |    7 ++++---
>   1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
> index 4bd9546..e4d997b 100644
> --- a/kernel/locking/mutex.c
> +++ b/kernel/locking/mutex.c
> @@ -432,7 +432,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
>   		if (owner && !mutex_spin_on_owner(lock, owner))
>   			break;
>   
> -		if ((atomic_read(&lock->count) == 1) &&
> +		/* Try to acquire the mutex if it is unlocked. */
> +		if (!mutex_is_locked(lock) &&
>   		    (atomic_cmpxchg(&lock->count, 1, 0) == 1)) {
>   			lock_acquired(&lock->dep_map, ip);
>   			if (use_ww_ctx) {
> @@ -479,9 +480,9 @@ slowpath:
>   
>   	/*
>   	 * Once more, try to acquire the lock. Only try-lock the mutex if
> -	 * lock->count >= 0 to reduce unnecessary xchg operations.
> +	 * it is unlocked to reduce unnecessary xchg() operations.
>   	 */
> -	if (atomic_read(&lock->count) >= 0 && (atomic_xchg(&lock->count, 0) == 1))
> +	if (!mutex_is_locked(lock) && (atomic_xchg(&lock->count, 0) == 1))
>   		goto skip_wait;
>   
>   	debug_mutex_lock_common(lock, &waiter);

Acked-by: Waiman Long <Waiman.Long@...com>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/