mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

y2038: nptl: Convert pthread_rwlock_{clock|timed}{rd|wr}lock to support 64 bit time

Browse Source 
The pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock,
pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock have been converted
to support 64 bit time.

This change uses new futex_abstimed_wait64 function in
./sysdeps/nptl/futex-helpers.c, which uses futex_time64 where possible.

The pthread_rwlock_{clock|timed}{rd|wr}lock only accepts absolute time.
Moreover, there is no need to check for NULL passed as *abstime pointer to the
syscalls as those calls have exported symbols marked with __nonull attribute
for abstime.

For systems with __TIMESIZE != 64 && __WORDSIZE == 32:
- Conversions between 64 bit time to 32 bit are necessary
- Redirection to pthread_rwlock_{clock|timed}{rd|wr}lock will provide support
  for 64 bit time

Build tests:
./src/scripts/build-many-glibcs.py glibcs

Run-time tests:
- Run specific tests on ARM/x86 32bit systems (qemu):
  https://github.com/lmajewski/meta-y2038 and run tests:
  https://github.com/lmajewski/y2038-tests/commits/master

Above tests were performed with Y2038 redirection applied as well as without
to test the proper usage of both __pthread_rwlock_{clock|timed}{rd|wr}lock64
and __pthread_rwlock_{clock|timed}{rd|wr}lock.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Lukasz Majewski 2020-09-08 11:51:23 +02:00
parent b2cdadde4d
commit 3102e28bd1
8 changed files with 104 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nptl/pthreadP.h
View File

@ -464,6 +464,10 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
# define __pthread_timedjoin_np64 __pthread_timedjoin_np
# define __pthread_cond_timedwait64 __pthread_cond_timedwait
# define __pthread_cond_clockwait64 __pthread_cond_clockwait
# define __pthread_rwlock_clockrdlock64 __pthread_rwlock_clockrdlock
# define __pthread_rwlock_clockwrlock64 __pthread_rwlock_clockwrlock
# define __pthread_rwlock_timedrdlock64 __pthread_rwlock_timedrdlock
# define __pthread_rwlock_timedwrlock64 __pthread_rwlock_timedwrlock
#else
extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
clockid_t clockid,
@ -481,6 +485,20 @@ extern int __pthread_cond_clockwait64 (pthread_cond_t *cond,
clockid_t clockid,
const struct __timespec64 *abstime);
libpthread_hidden_proto (__pthread_cond_clockwait64)
extern int __pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock,
clockid_t clockid,
const struct __timespec64 *abstime);
libpthread_hidden_proto (__pthread_rwlock_clockrdlock64)
extern int __pthread_rwlock_clockwrlock64 (pthread_rwlock_t *rwlock,
clockid_t clockid,
const struct __timespec64 *abstime);
libpthread_hidden_proto (__pthread_rwlock_clockwrlock64)
extern int __pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock,
const struct __timespec64 *abstime);
libpthread_hidden_proto (__pthread_rwlock_timedrdlock64)
extern int __pthread_rwlock_timedwrlock64 (pthread_rwlock_t *rwlock,
const struct __timespec64 *abstime);
libpthread_hidden_proto (__pthread_rwlock_timedwrlock64)
#endif
extern int __pthread_cond_timedwait (pthread_cond_t *cond,

20
nptl/pthread_rwlock_clockrdlock.c
View File

@ -21,8 +21,22 @@
/* See pthread_rwlock_common.c. */
int
pthread_rwlock_clockrdlock (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct timespec *abstime)
__pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct __timespec64 *abstime)
{
return __pthread_rwlock_rdlock_full (rwlock, clockid, abstime);
return __pthread_rwlock_rdlock_full64 (rwlock, clockid, abstime);
}
#if __TIMESIZE != 64
libpthread_hidden_def (__pthread_rwlock_clockrdlock64)
int
__pthread_rwlock_clockrdlock (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct timespec *abstime)
{
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
return __pthread_rwlock_clockrdlock64 (rwlock, clockid, &ts64);
}
#endif
weak_alias (__pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock)

20
nptl/pthread_rwlock_clockwrlock.c
View File

@ -21,8 +21,22 @@
/* See pthread_rwlock_common.c. */
int
pthread_rwlock_clockwrlock (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct timespec *abstime)
__pthread_rwlock_clockwrlock64 (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct __timespec64 *abstime)
{
return __pthread_rwlock_wrlock_full (rwlock, clockid, abstime);
return __pthread_rwlock_wrlock_full64 (rwlock, clockid, abstime);
}
#if __TIMESIZE != 64
libpthread_hidden_def (__pthread_rwlock_clockwrlock64)
int
__pthread_rwlock_clockwrlock (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct timespec *abstime)
{
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
return __pthread_rwlock_clockwrlock64 (rwlock, clockid, &ts64);
}
#endif
weak_alias (__pthread_rwlock_clockwrlock, pthread_rwlock_clockwrlock)

33
nptl/pthread_rwlock_common.c
View File

@ -278,9 +278,8 @@ __pthread_rwlock_rdunlock (pthread_rwlock_t *rwlock)
static __always_inline int
__pthread_rwlock_rdlock_full (pthread_rwlock_t *rwlock,
clockid_t clockid,
const struct timespec *abstime)
__pthread_rwlock_rdlock_full64 (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct __timespec64 *abstime)
{
unsigned int r;
@ -330,8 +329,9 @@ __pthread_rwlock_rdlock_full (pthread_rwlock_t *rwlock,
& PTHREAD_RWLOCK_RWAITING) != 0)
{
int private = __pthread_rwlock_get_private (rwlock);
int err = futex_abstimed_wait (&rwlock->__data.__readers,
r, clockid, abstime, private);
int err = __futex_abstimed_wait64 (&rwlock->__data.__readers,
r, clockid, abstime,
private);
/* We ignore EAGAIN and EINTR. On time-outs, we can just
return because we don't need to clean up anything. */
if (err == ETIMEDOUT)
@ -457,9 +457,9 @@ __pthread_rwlock_rdlock_full (pthread_rwlock_t *rwlock,
(&rwlock->__data.__wrphase_futex,
&wpf, wpf | PTHREAD_RWLOCK_FUTEX_USED)))
continue;
int err = futex_abstimed_wait (&rwlock->__data.__wrphase_futex,
1 | PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
int err = __futex_abstimed_wait64 (&rwlock->__data.__wrphase_futex,
1 | PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
if (err == ETIMEDOUT)
{
/* If we timed out, we need to unregister. If no read phase
@ -585,9 +585,8 @@ __pthread_rwlock_wrunlock (pthread_rwlock_t *rwlock)
static __always_inline int
__pthread_rwlock_wrlock_full (pthread_rwlock_t *rwlock,
clockid_t clockid,
const struct timespec *abstime)
__pthread_rwlock_wrlock_full64 (pthread_rwlock_t *rwlock, clockid_t clockid,
const struct __timespec64 *abstime)
{
/* Make sure any passed in clockid and timeout value are valid. Note that
the previous implementation assumed that this check *must* not be
@ -728,9 +727,9 @@ __pthread_rwlock_wrlock_full (pthread_rwlock_t *rwlock,
share the flag, and another writer will wake one of the writers
in this group. */
may_share_futex_used_flag = true;
int err = futex_abstimed_wait (&rwlock->__data.__writers_futex,
1 | PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
int err = __futex_abstimed_wait64 (&rwlock->__data.__writers_futex,
1 | PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
if (err == ETIMEDOUT)
{
if (prefer_writer)
@ -827,9 +826,9 @@ __pthread_rwlock_wrlock_full (pthread_rwlock_t *rwlock,
(&rwlock->__data.__wrphase_futex, &wpf,
PTHREAD_RWLOCK_FUTEX_USED)))
continue;
int err = futex_abstimed_wait (&rwlock->__data.__wrphase_futex,
PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
int err = __futex_abstimed_wait64 (&rwlock->__data.__wrphase_futex,
PTHREAD_RWLOCK_FUTEX_USED,
clockid, abstime, private);
if (err == ETIMEDOUT)
{
if (rwlock->__data.__flags != PTHREAD_RWLOCK_PREFER_READER_NP)

2
nptl/pthread_rwlock_rdlock.c
View File

@ -24,7 +24,7 @@ __pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
{
LIBC_PROBE (rdlock_entry, 1, rwlock);
int result = __pthread_rwlock_rdlock_full (rwlock, CLOCK_REALTIME, NULL);
int result = __pthread_rwlock_rdlock_full64 (rwlock, CLOCK_REALTIME, NULL);
LIBC_PROBE (rdlock_acquire_read, 1, rwlock);
return result;
}

20
nptl/pthread_rwlock_timedrdlock.c
View File

@ -20,8 +20,22 @@
/* See pthread_rwlock_common.c. */
int
pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
__pthread_rwlock_timedrdlock64 (pthread_rwlock_t *rwlock,
const struct __timespec64 *abstime)
{
return __pthread_rwlock_rdlock_full (rwlock, CLOCK_REALTIME, abstime);
return __pthread_rwlock_rdlock_full64 (rwlock, CLOCK_REALTIME, abstime);
}
#if __TIMESIZE != 64
libpthread_hidden_def (__pthread_rwlock_timedrdlock64)
int
__pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
return __pthread_rwlock_timedrdlock64 (rwlock, &ts64);
}
#endif
weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock)

20
nptl/pthread_rwlock_timedwrlock.c
View File

@ -20,8 +20,22 @@
/* See pthread_rwlock_common.c. */
int
pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
__pthread_rwlock_timedwrlock64 (pthread_rwlock_t *rwlock,
const struct __timespec64 *abstime)
{
return __pthread_rwlock_wrlock_full (rwlock, CLOCK_REALTIME, abstime);
return __pthread_rwlock_wrlock_full64 (rwlock, CLOCK_REALTIME, abstime);
}
#if __TIMESIZE != 64
libpthread_hidden_def (__pthread_rwlock_timedwrlock64)
int
__pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
const struct timespec *abstime)
{
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
return __pthread_rwlock_timedwrlock64 (rwlock, &ts64);
}
#endif
weak_alias (__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock)

2
nptl/pthread_rwlock_wrlock.c
View File

@ -24,7 +24,7 @@ __pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
{
LIBC_PROBE (wrlock_entry, 1, rwlock);
int result = __pthread_rwlock_wrlock_full (rwlock, CLOCK_REALTIME, NULL);
int result = __pthread_rwlock_wrlock_full64 (rwlock, CLOCK_REALTIME, NULL);
LIBC_PROBE (wrlock_acquire_write, 1, rwlock);
return result;
}