From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>,
Paul Eggert <eggert@cs.ucla.edu>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Andreas Schwab <schwab@suse.de>
Cc: Alistair Francis <alistair23@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
GNU C Library <libc-alpha@sourceware.org>,
Siddhesh Poyarekar <siddhesh@gotplt.org>,
Florian Weimer <fweimer@redhat.com>,
Florian Weimer <fw@deneb.enyo.de>,
Zack Weinberg <zackw@panix.com>,
Carlos O'Donell <carlos@redhat.com>
Subject: Re: [PATCH v3 2/2] y2038: linux: Provide __timerfd_settime64 implementation
Date: Thu, 2 Jan 2020 12:11:46 +0100 [thread overview]
Message-ID: <20200102121146.0b867ed5@jawa> (raw)
In-Reply-To: <20191217155858.28706-2-lukma@denx.de>
[-- Attachment #1: Type: text/plain, Size: 7378 bytes --]
Dear Community,
> This patch replaces auto generated wrapper (as described in
> sysdeps/unix/sysv/linux/syscalls.list) for timerfd_settime with one
> which adds extra support for reading and writing from Linux kernel 64
> bit time values on machines with __TIMESIZE != 64.
> There is no functional change for archs already supporting 64 bit
> time ABI.
>
> This patch is conceptually identical to timer_settime conversion
> already done in sysdeps/unix/sysv/linux/timer_settime.c.
> Please refer to corresponding commit message for detailed description
> of introduced functions and the testing procedure.
>
> ---
> Changes for v3:
> - Add missing libc_hidden_def()
>
> Changes for v2:
> - Remove "Contributed by" from the file header
> - Remove early check for (fd < 0) in __timerfd_settime64 as the fd
> correctness check is already done in Linux kernel
> - Add single descriptive comment line to provide concise explanation
> of the code
> ---
> include/time.h | 5 ++
> sysdeps/unix/sysv/linux/Makefile | 2 +-
> sysdeps/unix/sysv/linux/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/timerfd_settime.c | 87
> +++++++++++++++++++++++ 4 files changed, 93 insertions(+), 2
> deletions(-) create mode 100644
> sysdeps/unix/sysv/linux/timerfd_settime.c
>
> diff --git a/include/time.h b/include/time.h
> index eb5082b4d7..f23bfea737 100644
> --- a/include/time.h
> +++ b/include/time.h
> @@ -191,11 +191,16 @@ libc_hidden_proto (__timerfd_gettime64);
>
> #if __TIMESIZE == 64
> # define __timer_settime64 __timer_settime
> +# define __timerfd_settime64 __timerfd_settime
> #else
> extern int __timer_settime64 (timer_t timerid, int flags,
> const struct __itimerspec64 *value,
> struct __itimerspec64 *ovalue);
> +extern int __timerfd_settime64 (int fd, int flags,
> + const struct __itimerspec64 *value,
> + struct __itimerspec64 *ovalue);
> libc_hidden_proto (__timer_settime64);
> +libc_hidden_proto (__timerfd_settime64);
> #endif
>
> /* Compute the `struct tm' representation of T,
> diff --git a/sysdeps/unix/sysv/linux/Makefile
> b/sysdeps/unix/sysv/linux/Makefile index e599fcec23..70cf06bf36 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -19,7 +19,7 @@ sysdep_routines += adjtimex clone umount umount2
> readahead \ eventfd eventfd_read eventfd_write prlimit \
> personality epoll_wait tee vmsplice splice \
> open_by_handle_at mlock2 pkey_mprotect pkey_set
> pkey_get \
> - timerfd_gettime
> + timerfd_gettime timerfd_settime
>
> CFLAGS-gethostid.c = -fexceptions
> CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
> diff --git a/sysdeps/unix/sysv/linux/syscalls.list
> b/sysdeps/unix/sysv/linux/syscalls.list index 385007c662..16c673fc1a
> 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/syscalls.list
> @@ -94,7 +94,6 @@ fremovexattr - fremovexattr
> i:is fremovexattr mq_setattr -
> mq_getsetattr i:ipp mq_setattr
> timerfd_create EXTRA timerfd_create i:ii
> timerfd_create -timerfd_settime EXTRA
> timerfd_settime i:iipp timerfd_settime
> fanotify_init EXTRA fanotify_init i:ii
> fanotify_init
> diff --git a/sysdeps/unix/sysv/linux/timerfd_settime.c
> b/sysdeps/unix/sysv/linux/timerfd_settime.c new file mode 100644
> index 0000000000..5ebd2bd1a7
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/timerfd_settime.c
> @@ -0,0 +1,87 @@
> +/* timerfd_settime -- start or stop the timer referred to by file
> descriptor.
> + Copyright (C) 2019 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> License as
> + published by the Free Software Foundation; either version 2.1 of
> the
> + License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be
> useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; see the file COPYING.LIB.
> If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#include <errno.h>
> +#include <stdlib.h>
> +#include <time.h>
> +#include <sysdep.h>
> +#include <kernel-features.h>
> +
> +int
> +__timerfd_settime64 (int fd, int flags, const struct __itimerspec64
> *value,
> + struct __itimerspec64 *ovalue)
> +{
> +#ifdef __ASSUME_TIME64_SYSCALLS
> +# ifndef __NR_timerfd_settime64
> +# define __NR_timerfd_settime64 __NR_timerfd_settime
> +# endif
> + return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value,
> ovalue); +#else
> +# ifdef __NR_timerfd_settime64
> + int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags,
> value, ovalue);
> + if (ret == 0 || errno != ENOSYS)
> + return ret;
> +# endif
> + struct itimerspec its32, oits32;
> +
> + if (! in_time_t_range ((value->it_value).tv_sec)
> + || ! in_time_t_range ((value->it_interval).tv_sec))
> + {
> + __set_errno (EOVERFLOW);
> + return -1;
> + }
> +
> + its32.it_interval = valid_timespec64_to_timespec
> (value->it_interval);
> + its32.it_value = valid_timespec64_to_timespec (value->it_value);
> +
> + int retval = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,
> + &its32, ovalue ? &oits32 : NULL);
> + if (retval == 0 && ovalue)
> + {
> + ovalue->it_interval = valid_timespec_to_timespec64
> (oits32.it_interval);
> + ovalue->it_value = valid_timespec_to_timespec64
> (oits32.it_value);
> + }
> +
> + return retval;
> +#endif
> +}
> +
> +#if __TIMESIZE != 64
> +libc_hidden_def (__timerfd_settime64)
> +
> +int
> +__timerfd_settime (int fd, int flags, const struct itimerspec *value,
> + struct itimerspec *ovalue)
> +{
> + struct __itimerspec64 its64, oits64;
> + int retval;
> +
> + its64.it_interval = valid_timespec_to_timespec64
> (value->it_interval);
> + its64.it_value = valid_timespec_to_timespec64 (value->it_value);
> +
> + retval = __timerfd_settime64 (fd, flags, &its64, ovalue ? &oits64
> : NULL);
> + if (retval == 0 && ovalue)
> + {
> + ovalue->it_interval = valid_timespec64_to_timespec
> (oits64.it_interval);
> + ovalue->it_value = valid_timespec64_to_timespec
> (oits64.it_value);
> + }
> +
> + return retval;
> +}
> +#endif
> +strong_alias (__timerfd_settime, timerfd_settime)
Are there any more comments regarding this patch?
(Yes, I will need to update the year from 2019 to 2020, but this is
rather a cosmetic change).
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-01-02 11:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 15:58 [PATCH v3 1/2] y2038: linux: Provide __timerfd_gettime64 implementation Lukasz Majewski
2019-12-17 15:58 ` [PATCH v3 2/2] y2038: linux: Provide __timerfd_settime64 implementation Lukasz Majewski
2020-01-02 11:11 ` Lukasz Majewski [this message]
2020-01-02 11:11 ` [PATCH v3 1/2] y2038: linux: Provide __timerfd_gettime64 implementation Lukasz Majewski
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200102121146.0b867ed5@jawa \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=carlos@redhat.com \
--cc=eggert@cs.ucla.edu \
--cc=fw@deneb.enyo.de \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
--cc=siddhesh@gotplt.org \
--cc=zackw@panix.com \
/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).