From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Lukasz Majewski <lukma@denx.de>
Cc: libc-alpha@sourceware.org, Carlos O'Donell <carlos@redhat.com>
Subject: Re: [PATCH 18/18] linux: Only use 64-bit syscall if required for clock_nanosleep
Date: Thu, 17 Jun 2021 14:45:47 -0300 [thread overview]
Message-ID: <3664e85a-4ea0-20ce-61a4-ffdbe7b9db4b@linaro.org> (raw)
In-Reply-To: <20210617171115.403b27bc@ktm>
On 17/06/2021 12:11, Lukasz Majewski wrote:
> Hi Adhemerval,
>
>> 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.
>
> I'm not sure if the above description is correct.
>
> As fair as I understand this patch set - we check if timeout fits into
> 32-bit if:
>
> - We want to use legacy (32 bit) syscall when __ASSUME_TIME64_SYSCALLS
> is not defined to avoid calling syscalls twice.
>
> The problem with relative 64 bit timeouts will be apparent after we
> pass Y2038 year threshold.
Yes, but 64-bit relative timeout means that caller is passing a *very*
large timeout. It is possible indeed, but I don't think it the usual
way.
>
>>
>> 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/clock_nanosleep.c | 47
>> +++++++++++++---------- time/Makefile |
>> 9 +++++ time/tst-clock_nanosleep.c | 40
>> +++++++++++-------- 3 files changed, 60 insertions(+), 36 deletions(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c
>> b/sysdeps/unix/sysv/linux/clock_nanosleep.c index
>> 007f1736cb..46b0f1e269 100644 ---
>> a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++
>> b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -27,8 +27,9 @@
>> /* We can simply use the syscall. The CPU clocks are not supported
>> with this function. */
>> int
>> -__clock_nanosleep_time64 (clockid_t clock_id, int flags, const
>> struct __timespec64 *req,
>> - struct __timespec64 *rem)
>> +__clock_nanosleep_time64 (clockid_t clock_id, int flags,
>> + const struct __timespec64 *req,
>> + struct __timespec64 *rem)
>> {
>> if (clock_id == CLOCK_THREAD_CPUTIME_ID)
>> return EINVAL;
>> @@ -37,33 +38,37 @@ __clock_nanosleep_time64 (clockid_t clock_id, int
>> flags, const struct __timespec
>> /* If the call is interrupted by a signal handler or encounters an
>> error, it returns a positive value similar to errno. */
>> +
>> #ifndef __NR_clock_nanosleep_time64
>> # define __NR_clock_nanosleep_time64 __NR_clock_nanosleep
>> #endif
>> - int r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id,
>> - flags, req, rem);
>> -
>> -#ifndef __ASSUME_TIME64_SYSCALLS
>> - if (r == 0 || r != -ENOSYS)
>> - return -r;
>>
>> - if (! in_time_t_range (req->tv_sec))
>> + int r;
>> +#ifdef __ASSUME_TIME64_SYSCALLS
>> + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id,
>> flags, req,
>> + rem);
>> +#else
>> + bool is32bit = in_time_t_range (req->tv_sec);
>> + if (!is32bit)
>> {
>> - __set_errno (EOVERFLOW);
>> - return -1;
>> + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id,
>> flags,
>> + req, rem);
>> + if (r == -ENOSYS)
>> + r = -EOVERFLOW;
>> }
>> -
>> - struct timespec tr32;
>> - struct timespec ts32 = valid_timespec64_to_timespec (*req);
>> - r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, clock_id, flags,
>> - &ts32, &tr32);
>> - if (INTERNAL_SYSCALL_ERROR_P (r))
>> + else
>> {
>> - if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
>> - *rem = valid_timespec_to_timespec64 (tr32);
>> + struct timespec tr32;
>> + struct timespec ts32 = valid_timespec64_to_timespec (*req);
>> + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, clock_id, flags,
>> &ts32,
>> + &tr32);
>> + if (INTERNAL_SYSCALL_ERROR_P (r))
>> + {
>> + if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME)
>> == 0)
>> + *rem = valid_timespec_to_timespec64 (tr32);
>> + }
>> }
>> -#endif /* __ASSUME_TIME64_SYSCALLS */
>> -
>> +#endif
>> return -r;
>> }
>>
>> diff --git a/time/Makefile b/time/Makefile
>> index c84bd5d3ec..0bea84966c 100644
>> --- a/time/Makefile
>> +++ b/time/Makefile
>> @@ -86,6 +86,15 @@ $(objpfx)tst-strftime2.out: $(gen-locales)
>> $(objpfx)tst-strftime3.out: $(gen-locales)
>> endif
>>
>> +ifeq (yes,$(build-shared))
>> +librt = $(common-objpfx)rt/librt.so
>> +else
>> +librt = $(common-objpfx)rt/librt.a
>> +endif
>> +
>> +$(objpfx)tst-clock_nanosleep: $(librt)
>> +$(objpfx)tst-clock_nanosleep-time64: $(librt)
>> +
>> tz-cflags = -DTZDIR='"$(zonedir)"' \
>> -DTZDEFAULT='"$(localtime-file)"' \
>> -DTZDEFRULES='"$(posixrules-file)"'
>> diff --git a/time/tst-clock_nanosleep.c b/time/tst-clock_nanosleep.c
>> index 47537435c1..a5a7f9430a 100644
>> --- a/time/tst-clock_nanosleep.c
>> +++ b/time/tst-clock_nanosleep.c
>> @@ -20,38 +20,48 @@
>> #include <unistd.h>
>> #include <sys/time.h>
>> #include <time.h>
>> -
>> +#include <intprops.h>
>> +#include <support/support.h>
>> +#include <support/check.h>
>>
>> /* Test that clock_nanosleep() does sleep. */
>> -static int
>> -do_test (void)
>> +static void
>> +clock_nanosleep_test (void)
>> {
>> /* Current time. */
>> struct timeval tv1;
>> - (void) gettimeofday (&tv1, NULL);
>> + gettimeofday (&tv1, NULL);
>>
>> - struct timespec ts;
>> - ts.tv_sec = 1;
>> - ts.tv_nsec = 0;
>> + struct timespec ts = { 1, 0 };
>> TEMP_FAILURE_RETRY (clock_nanosleep (CLOCK_REALTIME, 0, &ts, &ts));
>>
>> /* At least one second must have passed. */
>> struct timeval tv2;
>> - (void) gettimeofday (&tv2, NULL);
>> + gettimeofday (&tv2, NULL);
>>
>> tv2.tv_sec -= tv1.tv_sec;
>> tv2.tv_usec -= tv1.tv_usec;
>> if (tv2.tv_usec < 0)
>> --tv2.tv_sec;
>>
>> - if (tv2.tv_sec < 1)
>> - {
>> - puts ("clock_nanosleep didn't sleep long enough");
>> - return 1;
>> - }
>> + TEST_VERIFY (tv2.tv_sec >= 1);
>> +}
>> +
>> +static void
>> +clock_nanosleep_large_timeout (void)
>> +{
>
> Please correct me if I'm wrong:
>
>> + support_create_timer (0, 100000000, false, NULL);
>
> You create timer with 100ms timeout
>
>> + struct timespec ts = { TYPE_MAXIMUM (time_t), 0 };
>
> ts is created to have maximal value for time_t seconds.
>
>> + int r = clock_nanosleep (CLOCK_REALTIME, 0, &ts, NULL);
>
> The clock_nanosleep is called (64 or 32 bit version - with proper
> in-glibc aliasing).
>
>> + TEST_VERIFY (r == EINTR || r == EOVERFLOW);
>
> We check if:
>
> - return is EOVERFLOW - this means that we want to use 64 bit time on
> machine which is only supporting 64 bit time.
We want to use a 64-bit relative timeout on a machine where
__NR_clock_nanosleep_time64 failed with ENOSYS, meaning a pre v5.1 kernel
without 64-bit time_t support.
>
> - return is EINTR - as the timer's (introduced in the earlier patch in
> this set) alarm triggers. Am I right that this check is to find out
> if the syscall is correctly executed by the kernel?
Yes, the EINTR means that syscall was interrupted by the alarm.
>
> Or is there any other issue?
I think these are the two possible situations.
>
>> +}
>>
>> +static int
>> +do_test (void)
>> +{
>> + clock_nanosleep_test ();
>> + clock_nanosleep_large_timeout ();
>> return 0;
>> }
>>
>> -#define TEST_FUNCTION do_test ()
>> -#include "../test-skeleton.c"
>> +#include <support/test-driver.c>
>
>
>
> 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
>
next prev parent reply other threads:[~2021-06-17 17:45 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 ` [PATCH 11/18] linux: Only use 64-bit syscall if required for semtimedop Adhemerval Zanella
2021-06-21 7:43 ` 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 [this message]
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=3664e85a-4ea0-20ce-61a4-ffdbe7b9db4b@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).