From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hjl@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1039)
 id 97A87385843F; Fri, 12 Nov 2021 18:32:50 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97A87385843F
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: H.J. Lu <hjl@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Avoid extra load with CAS in __pthread_mutex_clocklock_common
 [BZ #28537]
X-Act-Checkin: glibc
X-Git-Author: H.J. Lu <hjl.tools@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 0b82747dc48d5bf0871bdc6da8cb6eec1256355f
X-Git-Newrev: 49302b8fdf9103b6fc0a398678668a22fa19574c
Message-Id: <20211112183250.97A87385843F@sourceware.org>
Date: Fri, 12 Nov 2021 18:32:50 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Nov 2021 18:32:50 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=49302b8fdf9103b6fc0a398678668a22fa19574c

commit 49302b8fdf9103b6fc0a398678668a22fa19574c
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Nov 11 06:54:01 2021 -0800

    Avoid extra load with CAS in __pthread_mutex_clocklock_common [BZ #28537]
    
    Replace boolean CAS with value CAS to avoid the extra load.
    
    Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>

Diff:
---
 nptl/pthread_mutex_timedlock.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index 57f3f28869..f763cfc7fa 100644
--- a/nptl/pthread_mutex_timedlock.c
+++ b/nptl/pthread_mutex_timedlock.c
@@ -233,12 +233,12 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex,
 	     meantime.  */
 	  if ((oldval & FUTEX_WAITERS) == 0)
 	    {
-	      if (atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock,
-							oldval | FUTEX_WAITERS,
-							oldval)
-		  != 0)
+	      int val;
+	      if ((val = atomic_compare_and_exchange_val_acq
+		   (&mutex->__data.__lock, oldval | FUTEX_WAITERS,
+		    oldval)) != oldval)
 		{
-		  oldval = mutex->__data.__lock;
+		  oldval = val;
 		  continue;
 		}
 	      oldval |= FUTEX_WAITERS;