linux: Only use 64-bit syscall if required for semtimedop

For !__ASSUME_TIME64_SYSCALLS there is no need to issue a 64-bit syscall
if the provided timeout fits in a 32-bit one.  The 64-bit usage should
be rare since the timeout is a relative one.

Checked on i686-linux-gnu on a 4.15 kernel and on a 5.11 kernel
(with and without --enable-kernel=5.1) and on x86_64-linux-gnu.

Reviewed-by: Lukasz Majewski <lukma@denx.de>

1 files changed, 30 insertions, 23 deletions

diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
index b732b6db48..d4fea4e55a 100644
--- a/sysdeps/unix/sysv/linux/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
@@ -21,44 +21,51 @@
 #include <sysdep.h>
 #include <errno.h>
 
+static int
+semtimedop_syscall (int semid, struct sembuf *sops, size_t nsops,
+		    const struct __timespec64 *timeout)
+{
+#ifdef __NR_semtimedop_time64
+  return INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops, timeout);
+#elif defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS && defined __NR_semtimedop
+  return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout);
+#else
+  return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
+			      SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
+#endif
+}
+
 /* Perform user-defined atomical operation of array of semaphores.  */
 int
 __semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
 		const struct __timespec64 *timeout)
 {
-  int r;
-#if defined __NR_semtimedop_time64
-  r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops, timeout);
-#elif defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS && defined __NR_semtimedop
-  r = INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout);
+#ifdef __ASSUME_TIME64_SYSCALLS
+  return semtimedop_syscall (semid, sops, nsops, timeout);
 #else
-  r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
-			   SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout));
-#endif
-
-#ifndef __ASSUME_TIME64_SYSCALLS
-  if (r == 0 || errno != ENOSYS)
-    return r;
+  bool need_time64 = timeout != NULL && !in_time_t_range (timeout->tv_sec);
+  if (need_time64)
+    {
+      int r = semtimedop_syscall (semid, sops, nsops, timeout);
+      if (r == 0 || errno != ENOSYS)
+	return r;
+      __set_errno (EOVERFLOW);
+      return -1;
+    }
 
   struct timespec ts32, *pts32 = NULL;
   if (timeout != NULL)
     {
-      if (! in_time_t_range (timeout->tv_sec))
-	{
-	  __set_errno (EINVAL);
-	  return -1;
-	}
       ts32 = valid_timespec64_to_timespec (*timeout);
       pts32 = &ts32;
     }
-# if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
-  r = INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, pts32);
+# ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
+  return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, pts32);
 # else
-  r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
-			   SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32));
+  return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
+			      SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32));
 # endif
-#endif /* __ASSUME_TIME64_SYSCALLS  */
-  return r;
+#endif
 }
 #if __TIMESIZE != 64
 libc_hidden_def (__semtimedop64)