]> git.ipfire.org Git - thirdparty/glibc.git/commit
nptl: Fix pthread_rwlock_try*lock stalls (Bug 23844)
authorCarlos O'Donell <carlos@redhat.com>
Tue, 22 Jan 2019 03:50:12 +0000 (22:50 -0500)
committerAurelien Jarno <aurelien@aurel32.net>
Sun, 17 Feb 2019 10:44:19 +0000 (11:44 +0100)
commite8c13d5f7a6cd34bc2ac51a0c89fcbbfd2e5c043
tree909f7c05faecd8146ee1fa534fab110db52c0276
parent60f80624257ef84eacfd9b400bda1b5a5e8e7816
nptl: Fix pthread_rwlock_try*lock stalls (Bug 23844)

For a full analysis of both the pthread_rwlock_tryrdlock() stall
and the pthread_rwlock_trywrlock() stall see:
https://sourceware.org/bugzilla/show_bug.cgi?id=23844#c14

In the pthread_rwlock_trydlock() function we fail to inspect for
PTHREAD_RWLOCK_FUTEX_USED in __wrphase_futex and wake the waiting
readers.

In the pthread_rwlock_trywrlock() function we write 1 to
__wrphase_futex and loose the setting of the PTHREAD_RWLOCK_FUTEX_USED
bit, again failing to wake waiting readers during unlock.

The fix in the case of pthread_rwlock_trydlock() is to check for
PTHREAD_RWLOCK_FUTEX_USED and wake the readers.

The fix in the case of pthread_rwlock_trywrlock() is to only write
1 to __wrphase_futex if we installed the write phase, since all other
readers would be spinning waiting for this step.

We add two new tests, one exercises the stall for
pthread_rwlock_trywrlock() which is easy to exercise, and one exercises
the stall for pthread_rwlock_trydlock() which is harder to exercise.

The pthread_rwlock_trywrlock() test fails consistently without the fix,
and passes after. The pthread_rwlock_tryrdlock() test fails roughly
5-10% of the time without the fix, and passes all the time after.

Signed-off-by: Carlos O'Donell <carlos@redhat.com>
Signed-off-by: Torvald Riegel <triegel@redhat.com>
Signed-off-by: Rik Prohaska <prohaska7@gmail.com>
Co-authored-by: Torvald Riegel <triegel@redhat.com>
Co-authored-by: Rik Prohaska <prohaska7@gmail.com>
(cherry picked from commit 5fc9ed4c4058bfbdf51ad6e7aac7d209b580e8c4)
ChangeLog
NEWS
nptl/Makefile
nptl/pthread_rwlock_tryrdlock.c
nptl/pthread_rwlock_trywrlock.c
nptl/tst-rwlock-tryrdlock-stall.c [new file with mode: 0644]
nptl/tst-rwlock-trywrlock-stall.c [new file with mode: 0644]
support/Makefile
support/xpthread_rwlock_destroy.c [new file with mode: 0644]
support/xthread.h