From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Cc: Florian Weimer <fweimer@redhat.com>,
Oleh Derevenko <oleh.derevenko@gmail.com>,
Arjan van de Ven <arjan@linux.intel.com>,
Andreas Schwab <schwab@linux-m68k.org>,
"Paul A . Clarke" <pc@us.ibm.com>,
Noah Goldstein <goldstein.w.n@gmail.com>
Subject: [PATCH v5 2/3] Reduce CAS in __pthread_mutex_lock_full [BZ #28537]
Date: Wed, 10 Nov 2021 10:41:52 -0800 [thread overview]
Message-ID: <20211110184153.2269857-3-hjl.tools@gmail.com> (raw)
In-Reply-To: <20211110184153.2269857-1-hjl.tools@gmail.com>
Change __pthread_mutex_lock_full to do an atomic load and skip CAS if
compare may fail to reduce cache line bouncing on contended locks.
---
nptl/pthread_mutex_lock.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
index 2bd41767e0..d7e8efedd2 100644
--- a/nptl/pthread_mutex_lock.c
+++ b/nptl/pthread_mutex_lock.c
@@ -223,13 +223,13 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
newval |= (oldval & FUTEX_WAITERS) | assume_other_futex_waiters;
#endif
- newval
- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
- newval, oldval);
-
- if (newval != oldval)
+ int val = atomic_load_relaxed (&mutex->__data.__lock);
+ if (val != oldval
+ || ((val = atomic_compare_and_exchange_val_acq
+ (&mutex->__data.__lock, newval, oldval))
+ != oldval))
{
- oldval = newval;
+ oldval = val;
continue;
}
@@ -411,11 +411,15 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
# ifdef NO_INCR
newval |= FUTEX_WAITERS;
# endif
+ oldval = atomic_load_relaxed (&mutex->__data.__lock);
+ if (oldval != 0)
+ goto locked_mutex;
oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
newval, 0);
if (oldval != 0)
{
+ locked_mutex:;
/* The mutex is locked. The kernel will now take care of
everything. */
int private = (robust
@@ -554,6 +558,10 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
ceilval = ceiling << PTHREAD_MUTEX_PRIO_CEILING_SHIFT;
oldprio = ceiling;
+ oldval = atomic_load_relaxed (&mutex->__data.__lock);
+ if (oldval != ceilval)
+ goto ceilval_failed;
+
oldval
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
#ifdef NO_INCR
@@ -568,10 +576,13 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
do
{
- oldval
- = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
- ceilval | 2,
- ceilval | 1);
+ oldval = atomic_load_relaxed (&mutex->__data.__lock);
+ ceilval_failed:
+ if (oldval == (ceilval | 1))
+ oldval
+ = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
+ ceilval | 2,
+ ceilval | 1);
if ((oldval & PTHREAD_MUTEX_PRIO_CEILING_MASK) != ceilval)
break;
@@ -581,9 +592,10 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex)
ceilval | 2,
PTHREAD_MUTEX_PSHARED (mutex));
}
- while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
- ceilval | 2, ceilval)
- != ceilval);
+ while (atomic_load_relaxed (&mutex->__data.__lock) != ceilval
+ || (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
+ ceilval | 2, ceilval)
+ != ceilval));
}
while ((oldval & PTHREAD_MUTEX_PRIO_CEILING_MASK) != ceilval);
--
2.33.1
next prev parent reply other threads:[~2021-11-10 18:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 18:41 [PATCH v5 0/3] Optimize CAS " H.J. Lu
2021-11-10 18:41 ` [PATCH v5 1/3] Reduce CAS in low level locks " H.J. Lu
2021-11-10 18:41 ` H.J. Lu [this message]
2021-11-10 18:41 ` [PATCH v5 3/3] Optimize CAS in __pthread_mutex_lock_full " H.J. Lu
2021-11-10 20:23 ` [PATCH v5 0/3] Optimize CAS " Paul A. Clarke
2021-11-10 20:53 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211110184153.2269857-3-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=arjan@linux.intel.com \
--cc=fweimer@redhat.com \
--cc=goldstein.w.n@gmail.com \
--cc=libc-alpha@sourceware.org \
--cc=oleh.derevenko@gmail.com \
--cc=pc@us.ibm.com \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).