y2038: nptl: Convert sem_{clock|timed}wait to support 64 bit time
Commit Message
The sem_clockwait and sem_timedwait have been converted to support 64 bit time.
This change reuses futex_abstimed_wait_cancelable64 function introduced earlier.
The sem_{clock|timed}wait only accepts absolute time. Moreover, there is no
need to check for NULL passed as *abstime pointer to the syscalls as both calls
have exported symbols marked with __nonull attribute for abstime.
For systems with __TIMESIZE != 64 && __WORDSIZE == 32:
- Conversion from 32 bit time to 64 bit struct __timespec64 was necessary
- Redirection to __sem_{clock|timed}wait64 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 __sem_{clock|timed}wait64 and
__sem_{clock|timed}wait.
---
nptl/sem_clockwait.c | 20 +++++++++++++++++---
nptl/sem_timedwait.c | 20 +++++++++++++++++---
nptl/sem_wait.c | 5 +++--
nptl/sem_waitcommon.c | 12 ++++++------
nptl/semaphoreP.h | 13 +++++++++++++
5 files changed, 56 insertions(+), 14 deletions(-)
Comments
On 07/09/2020 18:41, Lukasz Majewski wrote:
> The sem_clockwait and sem_timedwait have been converted to support 64 bit time.
>
> This change reuses futex_abstimed_wait_cancelable64 function introduced earlier.
> The sem_{clock|timed}wait only accepts absolute time. Moreover, there is no
> need to check for NULL passed as *abstime pointer to the syscalls as both calls
> have exported symbols marked with __nonull attribute for abstime.
>
> For systems with __TIMESIZE != 64 && __WORDSIZE == 32:
> - Conversion from 32 bit time to 64 bit struct __timespec64 was necessary
> - Redirection to __sem_{clock|timed}wait64 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 __sem_{clock|timed}wait64 and
> __sem_{clock|timed}wait.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> nptl/sem_clockwait.c | 20 +++++++++++++++++---
> nptl/sem_timedwait.c | 20 +++++++++++++++++---
> nptl/sem_wait.c | 5 +++--
> nptl/sem_waitcommon.c | 12 ++++++------
> nptl/semaphoreP.h | 13 +++++++++++++
> 5 files changed, 56 insertions(+), 14 deletions(-)
>
> diff --git a/nptl/sem_clockwait.c b/nptl/sem_clockwait.c
> index b9bae75183..1b93f00054 100644
> --- a/nptl/sem_clockwait.c
> +++ b/nptl/sem_clockwait.c
> @@ -19,11 +19,12 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <time.h>
> +#include "semaphoreP.h"
> #include "sem_waitcommon.c"
>
> int
> -sem_clockwait (sem_t *sem, clockid_t clockid,
> - const struct timespec *abstime)
> +__sem_clockwait64 (sem_t *sem, clockid_t clockid,
> + const struct __timespec64 *abstime)
> {
> /* Check that supplied clockid is one we support, even if we don't end up
> waiting. */
> @@ -42,5 +43,18 @@ sem_clockwait (sem_t *sem, clockid_t clockid,
> if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
> return 0;
> else
> - return __new_sem_wait_slow ((struct new_sem *) sem, clockid, abstime);
> + return __new_sem_wait_slow64 ((struct new_sem *) sem, clockid, abstime);
> }
> +
Ok.
> +#if __TIMESIZE != 64
> +libpthread_hidden_def (__sem_clockwait64)
> +
> +int
> +__sem_clockwait (sem_t *sem, clockid_t clockid, const struct timespec *abstime)
> +{
> + struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
> +
> + return __sem_clockwait64 (sem, clockid, &ts64);
> +}
> +#endif
> +weak_alias (__sem_clockwait, sem_clockwait)
Ok.
> diff --git a/nptl/sem_timedwait.c b/nptl/sem_timedwait.c
> index 99c11bf20e..5d054c950d 100644
> --- a/nptl/sem_timedwait.c
> +++ b/nptl/sem_timedwait.c
> @@ -18,12 +18,13 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <time.h>
> +#include "semaphoreP.h"
> #include "sem_waitcommon.c"
>
> /* This is in a separate file because because sem_timedwait is only provided
> if __USE_XOPEN2K is defined. */
> int
> -sem_timedwait (sem_t *sem, const struct timespec *abstime)
> +__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime)
> {
> if (! valid_nanoseconds (abstime->tv_nsec))
> {
> @@ -37,6 +38,19 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
> if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
> return 0;
> else
> - return __new_sem_wait_slow ((struct new_sem *) sem,
> - CLOCK_REALTIME, abstime);
> + return __new_sem_wait_slow64 ((struct new_sem *) sem,
> + CLOCK_REALTIME, abstime);
> }
> +
> +#if __TIMESIZE != 64
> +libpthread_hidden_def (__sem_timedwait64)
> +
> +int
> +__sem_timedwait (sem_t *sem, const struct timespec *abstime)
> +{
> + struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
> +
> + return __sem_timedwait64 (sem, &ts64);
> +}
> +#endif
> +weak_alias (__sem_timedwait, sem_timedwait)
Ok.
> diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c
> index 171716fdbc..9374e0aaf6 100644
> --- a/nptl/sem_wait.c
> +++ b/nptl/sem_wait.c
> @@ -18,6 +18,7 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <lowlevellock.h> /* lll_futex* used by the old code. */
> +#include "semaphoreP.h"
> #include "sem_waitcommon.c"
>
> int
> @@ -39,8 +40,8 @@ __new_sem_wait (sem_t *sem)
> if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
> return 0;
> else
> - return __new_sem_wait_slow ((struct new_sem *) sem,
> - CLOCK_REALTIME, NULL);
> + return __new_sem_wait_slow64 ((struct new_sem *) sem,
> + CLOCK_REALTIME, NULL);
> }
> versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
>
Ok.
> diff --git a/nptl/sem_waitcommon.c b/nptl/sem_waitcommon.c
> index 5a6d2643ee..6dd4eb97cb 100644
> --- a/nptl/sem_waitcommon.c
> +++ b/nptl/sem_waitcommon.c
> @@ -104,18 +104,18 @@ __sem_wait_cleanup (void *arg)
> static int
> __attribute__ ((noinline))
> do_futex_wait (struct new_sem *sem, clockid_t clockid,
> - const struct timespec *abstime)
> + const struct __timespec64 *abstime)
> {
> int err;
>
> #if __HAVE_64B_ATOMICS
> - err = futex_abstimed_wait_cancelable (
> + err = __futex_abstimed_wait_cancelable64 (
> (unsigned int *) &sem->data + SEM_VALUE_OFFSET, 0,
> clockid, abstime,
> sem->private);
> #else
> - err = futex_abstimed_wait_cancelable (&sem->value, SEM_NWAITERS_MASK,
> - clockid, abstime, sem->private);
> + err = __futex_abstimed_wait_cancelable64 (&sem->value, SEM_NWAITERS_MASK,
> + clockid, abstime, sem->private);
> #endif
>
> return err;
Ok.
> @@ -162,8 +162,8 @@ __new_sem_wait_fast (struct new_sem *sem, int definitive_result)
> /* Slow path that blocks. */
> static int
> __attribute__ ((noinline))
> -__new_sem_wait_slow (struct new_sem *sem, clockid_t clockid,
> - const struct timespec *abstime)
> +__new_sem_wait_slow64 (struct new_sem *sem, clockid_t clockid,
> + const struct __timespec64 *abstime)
> {
> int err = 0;
>
Ok.
> diff --git a/nptl/semaphoreP.h b/nptl/semaphoreP.h
> index e7e1c9763f..f25ba329d7 100644
> --- a/nptl/semaphoreP.h
> +++ b/nptl/semaphoreP.h
> @@ -52,3 +52,16 @@ extern int __new_sem_wait (sem_t *sem);
> extern int __old_sem_wait (sem_t *sem);
> extern int __new_sem_trywait (sem_t *sem);
> extern int __new_sem_getvalue (sem_t *sem, int *sval);
> +
> +#if __TIMESIZE == 64
> +# define __sem_clockwait64 __sem_clockwait
> +# define __sem_timedwait64 __sem_timedwait
> +#else
> +extern int
> +__sem_clockwait64 (sem_t *sem, clockid_t clockid,
> + const struct __timespec64 *abstime);
> +libpthread_hidden_proto (__sem_clockwait64)
> +extern int
> +__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime);
> +libpthread_hidden_proto (__sem_timedwait64)
> +#endif
>
Ok.
@@ -19,11 +19,12 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
+#include "semaphoreP.h"
#include "sem_waitcommon.c"
int
-sem_clockwait (sem_t *sem, clockid_t clockid,
- const struct timespec *abstime)
+__sem_clockwait64 (sem_t *sem, clockid_t clockid,
+ const struct __timespec64 *abstime)
{
/* Check that supplied clockid is one we support, even if we don't end up
waiting. */
@@ -42,5 +43,18 @@ sem_clockwait (sem_t *sem, clockid_t clockid,
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
return 0;
else
- return __new_sem_wait_slow ((struct new_sem *) sem, clockid, abstime);
+ return __new_sem_wait_slow64 ((struct new_sem *) sem, clockid, abstime);
}
+
+#if __TIMESIZE != 64
+libpthread_hidden_def (__sem_clockwait64)
+
+int
+__sem_clockwait (sem_t *sem, clockid_t clockid, const struct timespec *abstime)
+{
+ struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
+
+ return __sem_clockwait64 (sem, clockid, &ts64);
+}
+#endif
+weak_alias (__sem_clockwait, sem_clockwait)
@@ -18,12 +18,13 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
+#include "semaphoreP.h"
#include "sem_waitcommon.c"
/* This is in a separate file because because sem_timedwait is only provided
if __USE_XOPEN2K is defined. */
int
-sem_timedwait (sem_t *sem, const struct timespec *abstime)
+__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime)
{
if (! valid_nanoseconds (abstime->tv_nsec))
{
@@ -37,6 +38,19 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
return 0;
else
- return __new_sem_wait_slow ((struct new_sem *) sem,
- CLOCK_REALTIME, abstime);
+ return __new_sem_wait_slow64 ((struct new_sem *) sem,
+ CLOCK_REALTIME, abstime);
}
+
+#if __TIMESIZE != 64
+libpthread_hidden_def (__sem_timedwait64)
+
+int
+__sem_timedwait (sem_t *sem, const struct timespec *abstime)
+{
+ struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
+
+ return __sem_timedwait64 (sem, &ts64);
+}
+#endif
+weak_alias (__sem_timedwait, sem_timedwait)
@@ -18,6 +18,7 @@
<https://www.gnu.org/licenses/>. */
#include <lowlevellock.h> /* lll_futex* used by the old code. */
+#include "semaphoreP.h"
#include "sem_waitcommon.c"
int
@@ -39,8 +40,8 @@ __new_sem_wait (sem_t *sem)
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
return 0;
else
- return __new_sem_wait_slow ((struct new_sem *) sem,
- CLOCK_REALTIME, NULL);
+ return __new_sem_wait_slow64 ((struct new_sem *) sem,
+ CLOCK_REALTIME, NULL);
}
versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
@@ -104,18 +104,18 @@ __sem_wait_cleanup (void *arg)
static int
__attribute__ ((noinline))
do_futex_wait (struct new_sem *sem, clockid_t clockid,
- const struct timespec *abstime)
+ const struct __timespec64 *abstime)
{
int err;
#if __HAVE_64B_ATOMICS
- err = futex_abstimed_wait_cancelable (
+ err = __futex_abstimed_wait_cancelable64 (
(unsigned int *) &sem->data + SEM_VALUE_OFFSET, 0,
clockid, abstime,
sem->private);
#else
- err = futex_abstimed_wait_cancelable (&sem->value, SEM_NWAITERS_MASK,
- clockid, abstime, sem->private);
+ err = __futex_abstimed_wait_cancelable64 (&sem->value, SEM_NWAITERS_MASK,
+ clockid, abstime, sem->private);
#endif
return err;
@@ -162,8 +162,8 @@ __new_sem_wait_fast (struct new_sem *sem, int definitive_result)
/* Slow path that blocks. */
static int
__attribute__ ((noinline))
-__new_sem_wait_slow (struct new_sem *sem, clockid_t clockid,
- const struct timespec *abstime)
+__new_sem_wait_slow64 (struct new_sem *sem, clockid_t clockid,
+ const struct __timespec64 *abstime)
{
int err = 0;
@@ -52,3 +52,16 @@ extern int __new_sem_wait (sem_t *sem);
extern int __old_sem_wait (sem_t *sem);
extern int __new_sem_trywait (sem_t *sem);
extern int __new_sem_getvalue (sem_t *sem, int *sval);
+
+#if __TIMESIZE == 64
+# define __sem_clockwait64 __sem_clockwait
+# define __sem_timedwait64 __sem_timedwait
+#else
+extern int
+__sem_clockwait64 (sem_t *sem, clockid_t clockid,
+ const struct __timespec64 *abstime);
+libpthread_hidden_proto (__sem_clockwait64)
+extern int
+__sem_timedwait64 (sem_t *sem, const struct __timespec64 *abstime);
+libpthread_hidden_proto (__sem_timedwait64)
+#endif