From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Lukasz Majewski <lukma@denx.de>,
Carlos O'Donell <carlos@redhat.com>
Subject: [PATCH 11/18] linux: Only use 64-bit syscall if required for semtimedop
Date: Thu, 17 Jun 2021 08:50:57 -0300 [thread overview]
Message-ID: <20210617115104.1359598-12-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20210617115104.1359598-1-adhemerval.zanella@linaro.org>
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.
---
sysdeps/unix/sysv/linux/semtimedop.c | 54 ++++++++++++++++------------
sysvipc/Makefile | 9 +++++
sysvipc/test-sysvsem.c | 22 +++++++++---
3 files changed, 57 insertions(+), 28 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
index b732b6db48..65a8c080f7 100644
--- a/sysdeps/unix/sysv/linux/semtimedop.c
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
@@ -21,44 +21,52 @@
#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 is32bit = timeout != NULL
+ ? in_time_t_range (timeout->tv_sec) : true;
+ if (!is32bit)
+ {
+ 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)
diff --git a/sysvipc/Makefile b/sysvipc/Makefile
index 86911803b5..d2acb6a70b 100644
--- a/sysvipc/Makefile
+++ b/sysvipc/Makefile
@@ -38,3 +38,12 @@ include ../Rules
CFLAGS-msgrcv.c += -fexceptions -fasynchronous-unwind-tables
CFLAGS-msgsnd.c += -fexceptions -fasynchronous-unwind-tables
+
+ifeq (yes,$(build-shared))
+librt = $(common-objpfx)rt/librt.so
+else
+librt = $(common-objpfx)rt/librt.a
+endif
+
+$(objpfx)test-sysvsem: $(librt)
+$(objpfx)test-sysvsem-time64: $(librt)
diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c
index 092418205d..d9034c3dae 100644
--- a/sysvipc/test-sysvsem.c
+++ b/sysvipc/test-sysvsem.c
@@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <intprops.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -30,6 +31,8 @@
#include <support/support.h>
#include <support/check.h>
#include <support/temp_file.h>
+#include <support/xtime.h>
+#include <support/xsignal.h>
/* These are for the temporary file we generate. */
static char *name;
@@ -112,11 +115,20 @@ do_test (void)
#ifdef _GNU_SOURCE
/* Set a time for half a second. The semaphore operation should timeout
with EAGAIN. */
- struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ };
- if (semtimedop (semid, &sb2, 1, &ts) != -1
- || (errno != EAGAIN && errno != ENOSYS))
- FAIL_EXIT1 ("semtimedop succeed or returned errno != {EAGAIN,ENOSYS} "
- "(errno=%i)", errno);
+ {
+ struct timespec ts = { 0 /* sec */, 500000000 /* nsec */ };
+ if (semtimedop (semid, &sb2, 1, &ts) != -1
+ || (errno != EAGAIN && errno != ENOSYS))
+ FAIL_EXIT1 ("semtimedop succeed or returned errno != {EAGAIN,ENOSYS} "
+ "(errno=%i)", errno);
+ }
+
+ {
+ support_create_timer (0, 100000000, false, NULL);
+ struct timespec ts = { TYPE_MAXIMUM (time_t), 0 };
+ TEST_COMPARE (semtimedop (semid, &sb2, 1, &ts), -1);
+ TEST_VERIFY (errno == EINTR || errno == EOVERFLOW);
+ }
#endif
/* Finally free up the semnaphore resource. */
--
2.30.2
next prev parent reply other threads:[~2021-06-17 11:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 11:50 [PATCH 00/18] More y2038 fixes Adhemerval Zanella
2021-06-17 11:50 ` [PATCH 01/18] Use 64 bit time_t stat internally Adhemerval Zanella
2021-06-21 7:42 ` Lukasz Majewski
2021-06-22 19:37 ` Florian Weimer
2021-06-22 19:51 ` Adhemerval Zanella
2021-06-17 11:50 ` [PATCH 02/18] Use LFS and 64 bit time for installed programs Adhemerval Zanella
2021-06-17 12:19 ` Andreas Schwab
2021-06-18 18:50 ` Adhemerval Zanella
2021-06-17 20:49 ` Joseph Myers
2021-06-18 18:14 ` Adhemerval Zanella
2021-06-17 11:50 ` [PATCH 03/18] support: Add support_create_timer Adhemerval Zanella
2021-06-21 7:42 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 04/18] linux: Only use 64-bit syscall if required for ppoll Adhemerval Zanella
2021-06-21 7:42 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 05/18] linux: Only use 64-bit syscall if required for pselect Adhemerval Zanella
2021-06-21 7:42 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 06/18] linux: Only use 64-bit syscall if required for select Adhemerval Zanella
2021-06-21 7:43 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 07/18] linux: Remove supports_time64 () from clock_getres Adhemerval Zanella
2021-06-21 7:43 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 08/18] linux: Remove supports_time64 () from clock_gettime Adhemerval Zanella
2021-06-21 7:43 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 09/18] linux: Remove time64-support Adhemerval Zanella
2021-06-21 7:43 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 10/18] linux: timerfd_gettime minor cleanup Adhemerval Zanella
2021-06-21 7:43 ` Lukasz Majewski
2021-06-17 11:50 ` Adhemerval Zanella [this message]
2021-06-21 7:43 ` [PATCH 11/18] linux: Only use 64-bit syscall if required for semtimedop Lukasz Majewski
2021-06-17 11:50 ` [PATCH 12/18] linux: Only use 64-bit syscall if required for timerfd_settime Adhemerval Zanella
2021-06-21 7:44 ` Lukasz Majewski
2021-06-17 11:50 ` [PATCH 13/18] linux: Only use 64-bit syscall if required for mq_timedreceive Adhemerval Zanella
2021-06-21 7:44 ` Lukasz Majewski
2021-06-17 11:51 ` [PATCH 14/18] linux: Only use 64-bit syscall if required for mq_timedsend Adhemerval Zanella
2021-06-21 7:44 ` Lukasz Majewski
2021-06-17 11:51 ` [PATCH 15/18] linux: Only use 64-bit syscall if required for sigtimedwait Adhemerval Zanella
2021-06-17 12:25 ` Andreas Schwab
2021-06-22 14:58 ` Adhemerval Zanella
2021-06-17 11:51 ` [PATCH 16/18] linux: Only use 64-bit syscall if required for utimensat family Adhemerval Zanella
2021-06-21 7:45 ` Lukasz Majewski
2021-06-17 11:51 ` [PATCH 17/18] linux: Only use 64-bit syscall if required for internal futex Adhemerval Zanella
2021-06-21 7:45 ` Lukasz Majewski
2021-06-17 11:51 ` [PATCH 18/18] linux: Only use 64-bit syscall if required for clock_nanosleep Adhemerval Zanella
2021-06-17 15:11 ` Lukasz Majewski
2021-06-17 17:45 ` Adhemerval Zanella
2021-06-21 7:46 ` Lukasz Majewski
2021-06-17 14:20 ` [PATCH 00/18] More y2038 fixes Lukasz Majewski
2021-06-17 17:41 ` Adhemerval Zanella
2021-06-17 20:58 ` Joseph Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210617115104.1359598-12-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=lukma@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).