picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nptl: Fix PTHREAD_PRIO_PROTECT timed lock 

The 878fe624d4 changed lll_futex_timed_wait, which expects a relative
timeout, with a __futex_abstimed_wait64, which expects an absolute
timeout.  However the code still passes a relative timeout.

Also, the PTHREAD_PRIO_PROTECT support for clocks different than
CLOCK_REALTIME was broken since the inclusion of
pthread_mutex_clocklock (9d20e22e46) since lll_futex_timed_wait
always use CLOCK_REALTIME.

This patch fixes by removing the relative time calculation.  It
also adds some xtests that tests both thread and inter-process
usage.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2020-11-25 17:15:51 -03:00
parent 9ff2674ef8
commit 71eeae0325
6 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nptl/Makefile
View File

@ -309,7 +309,8 @@ tests-internal := tst-robustpi8 tst-rwlock19 tst-rwlock20 \
tst-setgetname \
xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 tst-setgroups
tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 tst-setgroups \
tst-mutexpp5 tst-mutexpp9
# This test can run into task limits because of a linux kernel bug
# and then cause the make process to fail too, see bug 24537.

29
nptl/pthread_mutex_timedlock.c
View File

@ -547,30 +547,11 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex,
goto failpp;
}
struct __timespec64 rt;
/* Get the current time. */
__clock_gettime64 (CLOCK_REALTIME, &rt);
/* Compute relative timeout. */
rt.tv_sec = abstime->tv_sec - rt.tv_sec;
rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec;
if (rt.tv_nsec < 0)
{
rt.tv_nsec += 1000000000;
--rt.tv_sec;
}
/* Already timed out? */
if (rt.tv_sec < 0)
{
result = ETIMEDOUT;
goto failpp;
}
__futex_abstimed_wait64 (
(unsigned int *) &mutex->__data.__lock, clockid,
ceilval | 2, &rt, PTHREAD_MUTEX_PSHARED (mutex));
int e = __futex_abstimed_wait64 (
(unsigned int *) &mutex->__data.__lock, ceilval | 2,
clockid, abstime, PTHREAD_MUTEX_PSHARED (mutex));
if (e == ETIMEDOUT)
return ETIMEDOUT;
}
}
while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,

2
nptl/tst-mutexpp5.c Normal file
View File

@ -0,0 +1,2 @@
#define ENABLE_PP 1
#include "tst-mutex5.c"

2
nptl/tst-mutexpp9.c Normal file
View File

@ -0,0 +1,2 @@
#define ENABLE_PP 1
#include "tst-mutex9.c"

12
sysdeps/pthread/tst-mutex5.c
View File

@ -27,6 +27,9 @@
#include <support/check.h>
#include <support/timespec.h>
#ifdef ENABLE_PP
#include "tst-tpp.h"
#endif
#ifndef TYPE
# define TYPE PTHREAD_MUTEX_NORMAL
@ -47,8 +50,11 @@ do_test_clock (clockid_t clockid, const char *fnname)
TEST_COMPARE (pthread_mutexattr_init (&a), 0);
TEST_COMPARE (pthread_mutexattr_settype (&a, TYPE), 0);
#ifdef ENABLE_PI
#if defined ENABLE_PI
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT), 0);
#elif defined ENABLE_PP
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_PROTECT), 0);
TEST_COMPARE (pthread_mutexattr_setprioceiling (&a, 6), 0);
#endif
int err = pthread_mutex_init (&m, &a);
@ -110,6 +116,10 @@ do_test_clock (clockid_t clockid, const char *fnname)
static int do_test (void)
{
#ifdef ENABLE_PP
init_tpp_test ();
#endif
do_test_clock (CLOCK_USE_TIMEDLOCK, "timedlock");
do_test_clock (CLOCK_REALTIME, "clocklock(realtime)");
#ifndef ENABLE_PI

13
sysdeps/pthread/tst-mutex9.c
View File

@ -30,6 +30,10 @@
#include <support/timespec.h>
#include <support/xunistd.h>
#ifdef ENABLE_PP
#include "tst-tpp.h"
#endif
/* A bogus clock value that tells run_test to use pthread_mutex_timedlock
rather than pthread_mutex_clocklock. */
@ -73,8 +77,11 @@ do_test_clock (clockid_t clockid)
TEST_COMPARE (pthread_mutexattr_settype (&a, PTHREAD_MUTEX_RECURSIVE), 0);
#ifdef ENABLE_PI
#if defined ENABLE_PI
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT), 0);
#elif defined ENABLE_PP
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_PROTECT), 0);
TEST_COMPARE (pthread_mutexattr_setprioceiling (&a, 6), 0);
#endif
int e;
@ -131,6 +138,10 @@ do_test_clock (clockid_t clockid)
static int
do_test (void)
{
#ifdef ENABLE_PP
init_tpp_test ();
#endif
do_test_clock (CLOCK_USE_TIMEDLOCK);
do_test_clock (CLOCK_REALTIME);
#ifndef ENABLE_PI