y2038: nptl: Provide __futex_clock_wait_bitset64 to support 64 bit bitset

The commit:
"y2038: nptl: Convert pthread_mutex_{clock|timed}lock to support 64 bit"
SHA1: 29e9874a048f47e2d46c40253036c8d2de921548

introduced support for 64 bit timeouts. Unfortunately, it was missing the
code for bitset - i.e. lll_futex_clock_wait_bitset C preprocessor macro
was used. As a result the 64 bit struct __timespec64 was coerced to 32
bit struct timespec and regression visible as timeout was observed
(nptl/tst-robust10 on s390).

Reported-by: Stefan Liebler <stli@linux.ibm.com>
Tested-by: Stefan Liebler <stli@linux.ibm.com>

diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
index dc40399f0201298956905fef7b15f0c47e242e9e..fe9e651f6c6c530272f754d08d24585dbad43f3c 100644 (file)
--- a/nptl/pthread_mutex_timedlock.c
+++ b/nptl/pthread_mutex_timedlock.c
@@ -268,7 +268,7 @@ __pthread_mutex_clocklock_common (pthread_mutex_t *mutex,
          assume_other_futex_waiters |= FUTEX_WAITERS;
 
          /* Block using the futex.  */
-         int err = lll_futex_clock_wait_bitset (&mutex->__data.__lock,
+         int err = __futex_clock_wait_bitset64 (&mutex->__data.__lock,
              oldval, clockid, abstime,
              PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
          /* The futex call timed out.  */

diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c
index 2e1919f0565677023ae69358e26f7805ebfdb32c..457cd3cd6900c45ed3f73ba0b8562013e2f3413f 100644 (file)
--- a/sysdeps/nptl/futex-internal.c
+++ b/sysdeps/nptl/futex-internal.c
@@ -70,7 +70,28 @@ __futex_abstimed_wait32 (unsigned int* futex_word,
                                 abstime != NULL ? &ts32 : NULL,
                                 NULL /* Unused.  */, FUTEX_BITSET_MATCH_ANY);
 }
-#endif
+
+static int
+__futex_clock_wait_bitset32 (int *futexp, int val, clockid_t clockid,
+                             const struct __timespec64 *abstime, int private)
+{
+  struct timespec ts32;
+
+  if (abstime != NULL && ! in_time_t_range (abstime->tv_sec))
+    return -EOVERFLOW;
+
+  const unsigned int clockbit =
+    (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
+  const int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
+
+  if (abstime != NULL)
+    ts32 = valid_timespec64_to_timespec (*abstime);
+
+  return INTERNAL_SYSCALL_CALL (futex, futexp, op, val,
+                                abstime != NULL ? &ts32 : NULL,
+                                NULL /* Unused.  */, FUTEX_BITSET_MATCH_ANY);
+}
+#endif /* ! __ASSUME_TIME64_SYSCALLS */
 
 int
 __futex_abstimed_wait_cancelable64 (unsigned int* futex_word,
@@ -222,3 +243,28 @@ __futex_clocklock_wait64 (int *futex, int val, clockid_t clockid,
 
   return -err;
 }
+
+int
+__futex_clock_wait_bitset64 (int *futexp, int val, clockid_t clockid,
+                             const struct __timespec64 *abstime,
+                             int private)
+{
+  int ret;
+  if (! lll_futex_supported_clockid (clockid))
+    {
+      return -EINVAL;
+    }
+
+  const unsigned int clockbit =
+    (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0;
+  const int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private);
+
+  ret = INTERNAL_SYSCALL_CALL (futex_time64, futexp, op, val,
+                               abstime, NULL /* Unused.  */,
+                               FUTEX_BITSET_MATCH_ANY);
+#ifndef __ASSUME_TIME64_SYSCALLS
+  if (ret == -ENOSYS)
+    ret = __futex_clock_wait_bitset32 (futexp, val, clockid, abstime, private);
+#endif
+  return ret;
+}

diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index 8a5f62768fc0eb19ed2aa5aafd3f26ae72a1df5d..cd356e4fa83b9231472fd82ce6dc441de5d515f6 100644 (file)
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -603,4 +603,9 @@ __futex_clocklock64 (int *futex, clockid_t clockid,
   return err;
 }
 
+int
+__futex_clock_wait_bitset64 (int *futexp, int val, clockid_t clockid,
+                             const struct __timespec64 *abstime,
+                             int private) attribute_hidden;
+
 #endif  /* futex-internal.h */