From: Alistair Francis <alistair23@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH v2 03/14] linux: Add time64 semtimedop support
Date: Thu, 10 Sep 2020 12:23:36 -0700 [thread overview]
Message-ID: <CAKmqyKP4p-vMe05NanenYe5NYHJ=s9yQFh4zZ3y=FOKANoXEVw@mail.gmail.com> (raw)
In-Reply-To: <20200908145738.640039-3-adhemerval.zanella@linaro.org>
On Tue, Sep 8, 2020 at 7:58 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Either the __NR_semtimedop_time64 (for 32-bit) or the __NR_semtimedop
> (for 64-bit) syscall is used as default. The 32-bit fallback is used
> iff __ASSUME_TIME64_SYSCALLS is not defined, which assumes the kernel
> ABI provides either __NR_ipc or __NR_semtimeop (for 32-bit time_t).
>
> Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
> kernel).
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> sysdeps/unix/sysv/linux/include/sys/sem.h | 6 +++
> sysdeps/unix/sysv/linux/semtimedop.c | 57 +++++++++++++++++++----
> 2 files changed, 55 insertions(+), 8 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/include/sys/sem.h b/sysdeps/unix/sysv/linux/include/sys/sem.h
> index a9151e057d..f369c6b6d3 100644
> --- a/sysdeps/unix/sysv/linux/include/sys/sem.h
> +++ b/sysdeps/unix/sysv/linux/include/sys/sem.h
> @@ -7,9 +7,15 @@ __typeof__ (semtimedop) __semtimedop attribute_hidden;
>
> #if __TIMESIZE == 64
> # define __semctl64 __semctl
> +# define __semtimedop64 __semtimedop
> #else
> +# include <struct___timespec64.h>
> +
> extern int __semctl64 (int semid, int semnum, int cmd, ...);
> libc_hidden_proto (__semctl64);
> +extern int __semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
> + const struct __timespec64 *tmo);
> +libc_hidden_proto (__semtimedop64);
> #endif
>
> # endif
> diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
> index 6fdde09bad..56121fb0bf 100644
> --- a/sysdeps/unix/sysv/linux/semtimedop.c
> +++ b/sysdeps/unix/sysv/linux/semtimedop.c
> @@ -22,18 +22,59 @@
> #include <errno.h>
>
> /* Perform user-defined atomical operation of array of semaphores. */
> +int
> +__semtimedop64 (int semid, struct sembuf *sops, size_t nsops,
> + const struct __timespec64 *timeout)
> +{
> +#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS
> +# ifndef __NR_semtimedop_time64
> +# define __NR_semtimedop_time64 __NR_semtimedop
> +# endif
> + int r = INLINE_SYSCALL_CALL (semtimedop_time64, semid, sops, nsops,
> + timeout);
> +#else
> + int 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;
> +
> + 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);
> +# else
> + r = INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid,
> + SEMTIMEDOP_IPC_ARGS (nsops, sops, pts32));
> +# endif
> +#endif /* __ASSUME_TIME64_SYSCALLS */
> + return r;
> +}
> +#if __TIMESIZE != 64
> +libc_hidden_def (__semtimedop64)
>
> int
> __semtimedop (int semid, struct sembuf *sops, size_t nsops,
> const struct timespec *timeout)
> {
> - /* semtimedop wire-up syscall is not exported for 32-bit ABIs (they have
> - semtimedop_time64 instead with uses a 64-bit time_t). */
> -#if 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
> + struct __timespec64 ts64, *pts64 = NULL;
> + if (timeout != NULL)
> + {
> + ts64 = valid_timespec_to_timespec64 (*timeout);
> + pts64 = &ts64;
> + }
> + return __semtimedop64 (semid, sops, nsops, pts64);
> }
> +#endif
> weak_alias (__semtimedop, semtimedop)
> --
> 2.25.1
>
next prev parent reply other threads:[~2020-09-10 19:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 14:57 [PATCH v2 01/14] linux: Simplify clock_getres Adhemerval Zanella
2020-09-08 14:57 ` [PATCH v2 02/14] linux: Add ppoll time64 optimization Adhemerval Zanella
2020-09-10 19:21 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 03/14] linux: Add time64 semtimedop support Adhemerval Zanella
2020-09-10 19:23 ` Alistair Francis [this message]
2020-09-08 14:57 ` [PATCH v2 04/14] linux: Add time64 pselect support Adhemerval Zanella
2020-09-10 19:35 ` Alistair Francis
2020-09-12 1:22 ` H.J. Lu
2020-09-08 14:57 ` [PATCH v2 05/14] linux: Add time64 select support Adhemerval Zanella
2020-09-11 20:44 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 06/14] linux: Add time64 sigtimedwait support Adhemerval Zanella
2020-09-11 20:56 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 07/14] linux: Use 64-bit time_t syscall on clock_getcputclockid Adhemerval Zanella
2020-09-16 15:26 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 08/14] linux: Consolidate utimes Adhemerval Zanella
2020-09-16 15:30 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 09/14] linux: Fix time64 support for futimesat Adhemerval Zanella
2020-09-08 14:57 ` [PATCH v2 10/14] linux: Add time64 support for nanosleep Adhemerval Zanella
2020-09-16 17:16 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 11/14] linux: Add time64 recvmmsg support Adhemerval Zanella
2020-09-25 21:18 ` Alistair Francis
2020-09-08 14:57 ` [RFC 12/14] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Adhemerval Zanella
2020-09-08 14:57 ` [RFC 13/14] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2020-09-08 14:57 ` [RFC 14/14] linux: Add recvvmsg " Adhemerval Zanella
2020-09-10 19:20 ` [PATCH v2 01/14] linux: Simplify clock_getres Alistair Francis
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='CAKmqyKP4p-vMe05NanenYe5NYHJ=s9yQFh4zZ3y=FOKANoXEVw@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/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).