2025-01-01 18:14:45 +00:00
|
|
|
/* Copyright (C) 2003-2025 Free Software Foundation, Inc.
|
2003-06-22 23:55:27 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2003-06-22 23:55:27 +00:00
|
|
|
|
|
|
|
|
/* This test checks behavior not required by POSIX. */
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <pthread.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
static pthread_mutex_t *m;
|
|
|
|
|
static pthread_barrier_t b;
|
|
|
|
|
static pthread_cond_t c;
|
|
|
|
|
static bool done;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cl (void *arg)
|
|
|
|
|
{
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("cl: mutex_unlocked failed");
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void *
|
|
|
|
|
tf (void *arg)
|
|
|
|
|
{
|
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("tf: mutex_lock failed");
|
|
|
|
|
return (void *) 1l;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int e = pthread_barrier_wait (&b);
|
|
|
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
|
|
|
{
|
|
|
|
|
puts ("barrier_wait failed");
|
|
|
|
|
return (void *) 1l;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (arg == NULL)
|
|
|
|
|
do
|
|
|
|
|
if (pthread_cond_wait (&c, m) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("tf: cond_wait failed");
|
|
|
|
|
return (void *) 1l;
|
|
|
|
|
}
|
|
|
|
|
while (! done);
|
|
|
|
|
else
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
|
|
|
|
|
|
if (pthread_cond_wait (&c, m) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("tf: cond_wait failed");
|
|
|
|
|
return (void *) 1l;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
|
}
|
|
|
|
|
while (! done);
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("tf: mutex_unlock failed");
|
|
|
|
|
return (void *) 1l;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
check_type (const char *mas, pthread_mutexattr_t *ma)
|
|
|
|
|
{
|
2013-10-04 23:00:32 +00:00
|
|
|
int e;
|
2013-06-28 12:19:37 +00:00
|
|
|
|
2013-10-04 23:00:32 +00:00
|
|
|
e = pthread_mutex_init (m, ma);
|
|
|
|
|
if (e != 0)
|
2003-06-22 23:55:27 +00:00
|
|
|
{
|
2013-10-04 23:00:32 +00:00
|
|
|
#ifdef ENABLE_PI
|
|
|
|
|
if (e == ENOTSUP)
|
|
|
|
|
{
|
|
|
|
|
puts ("PI mutexes unsupported");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2003-06-22 23:55:27 +00:00
|
|
|
printf ("1st mutex_init failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("immediate mutex_destroy failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_init (m, ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("2nd mutex_init failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("1st mutex_lock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
e = pthread_mutex_destroy (m);
|
|
|
|
|
if (e == 0)
|
2003-06-22 23:55:27 +00:00
|
|
|
{
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
printf ("mutex_destroy of self-locked mutex succeeded for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (e != EBUSY)
|
|
|
|
|
{
|
|
|
|
|
printf ("mutex_destroy of self-locked mutex did not return EBUSY %s\n",
|
|
|
|
|
mas);
|
|
|
|
|
return 1;
|
2003-06-22 23:55:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("1st mutex_unlock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_trylock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("mutex_trylock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
e = pthread_mutex_destroy (m);
|
|
|
|
|
if (e == 0)
|
2003-06-22 23:55:27 +00:00
|
|
|
{
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
printf ("mutex_destroy of self-trylocked mutex succeeded for %s\n",
|
|
|
|
|
mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (e != EBUSY)
|
|
|
|
|
{
|
|
|
|
|
printf ("mutex_destroy of self-trylocked mutex did not return EBUSY %s\n",
|
|
|
|
|
mas);
|
|
|
|
|
return 1;
|
2003-06-22 23:55:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("2nd mutex_unlock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pthread_t th;
|
|
|
|
|
if (pthread_create (&th, NULL, tf, NULL) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("1st create failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
done = false;
|
|
|
|
|
|
|
|
|
|
e = pthread_barrier_wait (&b);
|
|
|
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
|
|
|
{
|
|
|
|
|
puts ("1st barrier_wait failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("2nd mutex_lock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("3rd mutex_unlock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
e = pthread_mutex_destroy (m);
|
|
|
|
|
if (e == 0)
|
2003-06-22 23:55:27 +00:00
|
|
|
{
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
printf ("mutex_destroy of condvar-used mutex succeeded for %s\n",
|
|
|
|
|
mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (e != EBUSY)
|
|
|
|
|
{
|
|
|
|
|
printf ("\
|
2003-06-22 23:55:27 +00:00
|
|
|
mutex_destroy of condvar-used mutex did not return EBUSY for %s\n", mas);
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
return 1;
|
2003-06-22 23:55:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done = true;
|
|
|
|
|
if (pthread_cond_signal (&c) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("cond_signal failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void *r;
|
|
|
|
|
if (pthread_join (th, &r) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("join failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (r != NULL)
|
|
|
|
|
{
|
|
|
|
|
puts ("thread didn't return NULL");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("mutex_destroy after condvar-use failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_init (m, ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("3rd mutex_init failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_create (&th, NULL, tf, (void *) 1) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd create failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
done = false;
|
|
|
|
|
|
|
|
|
|
e = pthread_barrier_wait (&b);
|
|
|
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd barrier_wait failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("3rd mutex_lock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("4th mutex_unlock failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
e = pthread_mutex_destroy (m);
|
|
|
|
|
if (e == 0)
|
2003-06-22 23:55:27 +00:00
|
|
|
{
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
printf ("2nd mutex_destroy of condvar-used mutex succeeded for %s\n",
|
|
|
|
|
mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (e != EBUSY)
|
|
|
|
|
{
|
|
|
|
|
printf ("\
|
2003-06-22 23:55:27 +00:00
|
|
|
2nd mutex_destroy of condvar-used mutex did not return EBUSY for %s\n",
|
Remove support for lock elision.
The support for lock elision was already deprecated with glibc 2.42:
commit 77438db8cfa6ee66b3906230156bdae11c49a195
"Mark support for lock elision as deprecated."
See also discussions:
https://sourceware.org/pipermail/libc-alpha/2025-July/168492.html
This patch removes the architecture specific support for lock elision
for x86, powerpc and s390 by removing the elision-conf.h, elision-conf.c,
elision-lock.c, elision-timed.c, elision-unlock.c, elide.h, htm.h/hle.h files.
Those generic files are also removed.
The architecture specific structures are adjusted and the elision fields are
marked as unused. See struct_mutex.h files.
Furthermore in struct_rwlock.h, the leftover __rwelision was also removed.
Those were originally removed with commit 0377a7fde6dfcc078dda29a1225d7720a0931357
"nptl: Remove rwlock elision definitions"
and by chance reintroduced with commit 7df8af43ad1cd8ce527444de50bee6f35eebe071
"nptl: Add struct_rwlock.h"
The common code (e.g. the pthread_mutex-files) are changed back to the time
before lock elision was introduced with the x86-support:
- commit 1cdbe579482c07e9f4bb3baa4864da2d3e7eb837
"Add the low level infrastructure for pthreads lock elision with TSX"
- commit b023e4ca99f5e81f90d87d23cd267ef2abd2388c
"Add new internal mutex type flags for elision."
- commit 68cc29355f3334c7ad18f648ff9a6383a0916d23
"Add minimal test suite changes for elision enabled kernels"
- commit e8c659d74e011346785355eeef03b7fb6f533c61
"Add elision to pthread_mutex_{try,timed,un}lock"
- commit 49186d21ef2d87986bccaf0a7c45c48c91b265f3
"Disable elision for any pthread_mutexattr_settype call"
- commit 1717da59aed9612becd56aaa1249aac695af4c8a
"Add a configure option to enable lock elision and disable by default"
Elision is removed also from the tunables, the initialization part, the
pretty-printers and the manual.
Some extra handling in the testsuite is removed as well as the full tst-mutex10
testcase, which tested a race while enabling lock elision.
I've also searched the code for "elision", "elide", "transaction" and e.g.
cleaned some comments.
I've run the testsuite on x86_64 and s390x and run the build-many-glibcs.py
script.
Thanks to Sachin Monga, this patch is also tested on powerpc.
A NEWS entry also mentions the removal.
Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
2025-10-28 14:21:18 +00:00
|
|
|
mas);
|
|
|
|
|
return 1;
|
2003-06-22 23:55:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_cancel (th) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("cond_cancel failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_join (th, &r) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("join failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (r != PTHREAD_CANCELED)
|
|
|
|
|
{
|
|
|
|
|
puts ("thread not canceled");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
|
|
|
{
|
|
|
|
|
printf ("mutex_destroy after condvar-canceled failed for %s\n", mas);
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
do_test (void)
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_t mm;
|
|
|
|
|
m = &mm;
|
|
|
|
|
|
|
|
|
|
if (pthread_barrier_init (&b, NULL, 2) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("barrier_init failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_cond_init (&c, NULL) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("cond_init failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
puts ("check normal mutex");
|
|
|
|
|
int res = check_type ("normal", NULL);
|
|
|
|
|
|
|
|
|
|
pthread_mutexattr_t ma;
|
|
|
|
|
if (pthread_mutexattr_init (&ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("1st mutexattr_init failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (pthread_mutexattr_settype (&ma, PTHREAD_MUTEX_RECURSIVE) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("1st mutexattr_settype failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2013-05-09 14:12:26 +00:00
|
|
|
#ifdef ENABLE_PI
|
|
|
|
|
if (pthread_mutexattr_setprotocol (&ma, PTHREAD_PRIO_INHERIT))
|
|
|
|
|
{
|
|
|
|
|
puts ("1st pthread_mutexattr_setprotocol failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2003-06-22 23:55:27 +00:00
|
|
|
puts ("check recursive mutex");
|
|
|
|
|
res |= check_type ("recursive", &ma);
|
|
|
|
|
if (pthread_mutexattr_destroy (&ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("1st mutexattr_destroy failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pthread_mutexattr_init (&ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd mutexattr_init failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
if (pthread_mutexattr_settype (&ma, PTHREAD_MUTEX_ERRORCHECK) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd mutexattr_settype failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
2013-05-09 14:12:26 +00:00
|
|
|
#ifdef ENABLE_PI
|
|
|
|
|
if (pthread_mutexattr_setprotocol (&ma, PTHREAD_PRIO_INHERIT))
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd pthread_mutexattr_setprotocol failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2003-06-22 23:55:27 +00:00
|
|
|
puts ("check error-checking mutex");
|
|
|
|
|
res |= check_type ("error-checking", &ma);
|
|
|
|
|
if (pthread_mutexattr_destroy (&ma) != 0)
|
|
|
|
|
{
|
|
|
|
|
puts ("2nd mutexattr_destroy failed");
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
|
|
|
#include "../test-skeleton.c"
|