From 2c0982eb93c37af30583a117589ceb0ab3402c11 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 15 Jun 2021 22:56:12 -0300 Subject: linux: Only use 64-bit syscall if required for timerfd_settime 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 --- sysdeps/unix/sysv/linux/timerfd_settime.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'sysdeps/unix/sysv/linux/timerfd_settime.c') diff --git a/sysdeps/unix/sysv/linux/timerfd_settime.c b/sysdeps/unix/sysv/linux/timerfd_settime.c index 0dd6fa026e..0069e1374a 100644 --- a/sysdeps/unix/sysv/linux/timerfd_settime.c +++ b/sysdeps/unix/sysv/linux/timerfd_settime.c @@ -29,31 +29,34 @@ __timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value, #ifndef __NR_timerfd_settime64 # define __NR_timerfd_settime64 __NR_timerfd_settime #endif - int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue); -#ifndef __ASSUME_TIME64_SYSCALLS - if (ret == 0 || errno != ENOSYS) - return ret; - if (! in_time_t_range ((value->it_value).tv_sec) - || ! in_time_t_range ((value->it_interval).tv_sec)) +#ifdef __ASSUME_TIME64_SYSCALLS + return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue); +#else + bool need_time64 = !in_time_t_range (value->it_value.tv_sec) + || !in_time_t_range (value->it_interval.tv_sec); + if (need_time64) { + int r = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, + ovalue); + if (r == 0 || errno != ENOSYS) + return r; __set_errno (EOVERFLOW); - return -1; + return r; } struct itimerspec its32, oits32; its32.it_interval = valid_timespec64_to_timespec (value->it_interval); its32.it_value = valid_timespec64_to_timespec (value->it_value); - - ret = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags, - &its32, ovalue ? &oits32 : NULL); + int ret = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags, + &its32, ovalue != NULL ? &oits32 : NULL); if (ret == 0 && ovalue != NULL) { ovalue->it_interval = valid_timespec_to_timespec64 (oits32.it_interval); ovalue->it_value = valid_timespec_to_timespec64 (oits32.it_value); } -#endif return ret; +#endif } #if __TIMESIZE != 64 -- cgit v1.2.3-70-g09d2