Remove support for lock elision.
authorStefan Liebler <stli@linux.ibm.com>
Tue, 28 Oct 2025 14:21:18 +0000 (15:21 +0100)
committerStefan Liebler <stli@linux.ibm.com>
Tue, 18 Nov 2025 13:21:13 +0000 (14:21 +0100)
commitb9579342c68baf0beacfb4e93b9a6a325d3f9527
treeb2912881442af3f3ad2378633f0bb3e4a970284d
parent5029b63280b505467d3452e91a1c51705e34ed35
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>
68 files changed:
NEWS
elf/dl-tunables.list
elf/libc_early_init.c
manual/README.pretty-printers
manual/tunables.texi
nptl/Makefile
nptl/elision-conf.c [deleted file]
nptl/elision-conf.h [deleted file]
nptl/elision-lock.c [deleted file]
nptl/elision-timed.c [deleted file]
nptl/elision-trylock.c [deleted file]
nptl/elision-unlock.c [deleted file]
nptl/lowlevellock.c
nptl/nptl-printers.py
nptl/nptl_lock_constants.pysym
nptl/pthread_mutex_cond_lock.c
nptl/pthread_mutex_lock.c
nptl/pthread_mutex_timedlock.c
nptl/pthread_mutex_trylock.c
nptl/pthread_mutex_unlock.c
nptl/pthread_mutexattr_gettype.c
nptl/pthread_mutexattr_settype.c
nptl/pthread_rwlock_common.c
nptl/test-mutex-printers.py
nptl/tst-mutex8.c
scripts/test_printers_common.py
sysdeps/generic/elide.h [deleted file]
sysdeps/nptl/bits/struct_mutex.h
sysdeps/nptl/bits/struct_rwlock.h
sysdeps/nptl/lowlevellock.h
sysdeps/nptl/pthreadP.h
sysdeps/powerpc/nptl/bits/struct_mutex.h
sysdeps/powerpc/nptl/bits/struct_rwlock.h
sysdeps/powerpc/nptl/elide.h [deleted file]
sysdeps/pthread/Makefile
sysdeps/pthread/elision-conf.h [deleted file]
sysdeps/pthread/tst-mutex-errorcheck.c
sysdeps/pthread/tst-mutex10.c [deleted file]
sysdeps/pthread/tst-mutex5.c
sysdeps/s390/configure
sysdeps/s390/configure.ac
sysdeps/s390/nptl/bits/struct_mutex.h
sysdeps/unix/sysv/linux/powerpc/elision-conf.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/elision-conf.h [deleted file]
sysdeps/unix/sysv/linux/powerpc/elision-lock.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/elision-timed.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/elision-trylock.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/elision-unlock.c [deleted file]
sysdeps/unix/sysv/linux/powerpc/htm.h [deleted file]
sysdeps/unix/sysv/linux/s390/Makefile
sysdeps/unix/sysv/linux/s390/elision-conf.c [deleted file]
sysdeps/unix/sysv/linux/s390/elision-conf.h [deleted file]
sysdeps/unix/sysv/linux/s390/elision-lock.c [deleted file]
sysdeps/unix/sysv/linux/s390/elision-timed.c [deleted file]
sysdeps/unix/sysv/linux/s390/elision-trylock.c [deleted file]
sysdeps/unix/sysv/linux/s390/elision-unlock.c [deleted file]
sysdeps/unix/sysv/linux/s390/htm.h [deleted file]
sysdeps/unix/sysv/linux/x86/Makefile
sysdeps/unix/sysv/linux/x86/elision-conf.c [deleted file]
sysdeps/unix/sysv/linux/x86/elision-conf.h [deleted file]
sysdeps/unix/sysv/linux/x86/elision-lock.c [deleted file]
sysdeps/unix/sysv/linux/x86/elision-timed.c [deleted file]
sysdeps/unix/sysv/linux/x86/elision-trylock.c [deleted file]
sysdeps/unix/sysv/linux/x86/elision-unlock.c [deleted file]
sysdeps/unix/sysv/linux/x86/hle.h [deleted file]
sysdeps/x86/elide.h [deleted file]
sysdeps/x86/nptl/bits/struct_mutex.h
sysdeps/x86/nptl/bits/struct_rwlock.h
This page took 0.12824 seconds and 5 git commands to generate.