aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorLukasz Majewski <lukma@denx.de>2019-12-06 16:20:33 +0100
committerLukasz Majewski <lukma@denx.de>2020-02-02 11:23:23 +0100
commiteae22432723b877354291aca4dbbfde5891dad59 (patch)
tree2934b365f8ea18f6e0af56b42223022aae3e654e /sysdeps
parent0f6e6b97647891ae569018f9d6923dc5eee694c9 (diff)
downloadglibc-eae22432723b877354291aca4dbbfde5891dad59.tar
glibc-eae22432723b877354291aca4dbbfde5891dad59.tar.gz
glibc-eae22432723b877354291aca4dbbfde5891dad59.tar.bz2
glibc-eae22432723b877354291aca4dbbfde5891dad59.zip
y2038: linux: Provide __timerfd_settime64 implementation
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. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> --- Changes for v4: - Update date from 2019 to 2020 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
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list1
-rw-r--r--sysdeps/unix/sysv/linux/timerfd_settime.c87
3 files changed, 88 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 74923740b9..11c13cfb0d 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -61,7 +61,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 adb9055ce2..1fa546f231 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -93,7 +93,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..164b4e860a
--- /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) 2020 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)