From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
To: Lukasz Majewski <lukma@denx.de>
Cc: Florian Weimer <fweimer@redhat.com>,
GNU C Library <libc-alpha@sourceware.org>,
Andreas Schwab <schwab@suse.de>,
Alistair Francis <alistair.francis@wdc.com>,
Joseph Myers <joseph@codesourcery.com>
Subject: Re: [PATCH v2 6/7] y2038: linux: Provide __ntp_gettime64 implementation
Date: Tue, 19 May 2020 17:25:55 -0300 [thread overview]
Message-ID: <6676f4f7-3287-e80a-a9a6-2ec877b0abe4@linaro.org> (raw)
In-Reply-To: <20200519222048.7e212556@jawa>
[-- Attachment #1.1: Type: text/plain, Size: 5094 bytes --]
On 19/05/2020 17:20, Lukasz Majewski wrote:
> Hi Adhemerval,
>
>> On 08/05/2020 11:56, Lukasz Majewski wrote:
>>> This patch provides new __ntp_gettime64 explicit 64 bit function
>>> for getting time parameters via NTP interface.
>>>
>>> Internally, the __clock_adjtime64 syscall is used instead of
>>> __adjtimex. This patch is necessary for having architectures with
>>> __WORDSIZE == 32 Y2038 safe.
>>>
>>> Moreover, a 32 bit version - __ntp_gettime has been refactored to
>>> internally use __ntp_gettime64.
>>>
>>> The __ntp_gettime is now supposed to be used on systems still
>>> supporting 32 bit time (__TIMESIZE != 64) - hence the necessary
>>> conversions between struct ntptimeval and 64 bit struct
>>> __ntptimeval64.
>>>
>>> Build tests:
>>> ./src/scripts/build-many-glibcs.py glibcs
>>>
>>> Run-time tests:
>>> - Run specific tests on ARM/x86 32bit systems (qemu):
>>> https://github.com/lmajewski/meta-y2038 and run tests:
>>> https://github.com/lmajewski/y2038-tests/commits/master
>>>
>>> Above tests were performed with Y2038 redirection applied as well
>>> as without to test the proper usage of both __ntp_gettime64 and
>>> __ntp_gettime.
>>
>> Ok with a doubt below.
>>
>> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
>>
>>> ---
>>> sysdeps/unix/sysv/linux/include/sys/timex.h | 4 ++++
>>> sysdeps/unix/sysv/linux/ntp_gettime.c | 24
>>> ++++++++++++++++++--- 2 files changed, 25 insertions(+), 3
>>> deletions(-)
>>>
>>> diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h
>>> b/sysdeps/unix/sysv/linux/include/sys/timex.h index
>>> e762e03230..ef53515803 100644 ---
>>> a/sysdeps/unix/sysv/linux/include/sys/timex.h +++
>>> b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -33,6 +33,7 @@
>>> libc_hidden_proto (__adjtimex) # define __clock_adjtime64
>>> __clock_adjtime # define ___adjtimex64 ___adjtimex
>>> # define __ntptimeval64 ntptimeval
>>> +# define __ntp_gettime64 __ntp_gettime
>>> # else
>>>
>>> struct __timex64
>>> @@ -91,6 +92,9 @@ struct __ntptimeval64
>>> long int __glibc_reserved3;
>>> long int __glibc_reserved4;
>>> };
>>> +extern int __ntp_gettime64 (struct __ntptimeval64 *ntv);
>>> +libc_hidden_proto (__ntp_gettime64)
>>> +
>>> # endif
>>>
>>> /* Convert a known valid struct timex into a struct __timex64. */
>>>
>>
>> Ok.
>>
>>> diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c
>>> b/sysdeps/unix/sysv/linux/ntp_gettime.c index
>>> c8d6a197dc..21aeffadeb 100644 ---
>>> a/sysdeps/unix/sysv/linux/ntp_gettime.c +++
>>> b/sysdeps/unix/sysv/linux/ntp_gettime.c @@ -17,6 +17,7 @@
>>>
>>> #define ntp_gettime ntp_gettime_redirect
>>>
>>> +#include <time.h>
>>> #include <sys/timex.h>
>>>
>>> #undef ntp_gettime
>>> @@ -27,15 +28,32 @@
>>>
>>>
>>> int
>>> -ntp_gettime (struct ntptimeval *ntv)
>>> +__ntp_gettime64 (struct __ntptimeval64 *ntv)
>>> {
>>> - struct timex tntx;
>>> + struct __timex64 tntx;
>>> int result;
>>>
>>> tntx.modes = 0;
>>> - result = __adjtimex (&tntx);
>>> + result = __clock_adjtime64 (CLOCK_REALTIME, &tntx);
>>> ntv->time = tntx.time;
>>> ntv->maxerror = tntx.maxerror;
>>> ntv->esterror = tntx.esterror;
>>> return result;
>>> }
>>
>> Ok. Maybe add a comment stating that using CLOCK_REALTIME should
>> not make the function fail with EINVAL, ENODEV, or EOPNOTSUPP.
>> I am not sure about EPERM in this situation, should we check for
>> that and avoid seeting NTV in such situation?
>>
>
> I will add following comment:
>
> /* Using the CLOCK_REALTIME with __clock_adjtime64 (as a replacement
> for Y2038 unsafe adjtimex) will not make the function fail with EINVAL,
> ENODEV, or EOPNOTSUPP. */
Maybe:
/* clock_adjtime64 with CLOCK_REALTIME does not trigger EINVAL,
ENODEV, or EOPNOTSUPP. It might still trigger EPERM. */
>
> Regarding the EPERM:
>
> The adjtimex also could return EPERM:
> http://man7.org/linux/man-pages/man2/adjtimex.2.html
>
> which would be propagated to caller of ntp_gettime. In this case the
> ntv structure would get updated.
>
> If we want to preserve the same behavior, it would be correct to leave
> the code as is (and ntv would get updated anyway).
Alight, we can track this in another patch.
>
>>> +
>>> +#if __TIMESIZE != 64
>>> +libc_hidden_def (__ntp_gettime64)
>>> +
>>> +int
>>> +__ntp_gettime (struct ntptimeval *ntv)
>>> +{
>>> + struct __ntptimeval64 ntv64;
>>> + int result;
>>> +
>>> + result = __ntp_gettime64 (&ntv64);
>>> + *ntv = valid_ntptimeval64_to_ntptimeval (ntv64);
>>> +
>>> + return result;
>>> +}
>>> +#endif
>>> +strong_alias (__ntp_gettime, ntp_gettime)
>>>
>>
>> Ok.
>
>
>
>
> 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: 833 bytes --]
next prev parent reply other threads:[~2020-05-19 20:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 14:56 [PATCH v2 0/7] y2038: Convert clock_adjtime related syscalls to support 64 bit time Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 1/7] y2038: linux: Provide __clock_adjtime64 implementation Lukasz Majewski
2020-05-15 10:03 ` Lukasz Majewski
2020-05-19 19:07 ` Adhemerval Zanella via Libc-alpha
2020-05-19 19:58 ` Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 2/7] y2038: linux: Provide ___adjtimex64 implementation Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 3/7] y2038: linux: Provide __adjtime64 implementation Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 4/7] y2038: Introduce struct __ntptimeval64 - new internal glibc type Lukasz Majewski
2020-05-19 19:10 ` Adhemerval Zanella via Libc-alpha
2020-05-08 14:56 ` [PATCH v2 5/7] y2038: Provide conversion helpers for struct __ntptimeval64 Lukasz Majewski
2020-05-19 19:12 ` Adhemerval Zanella via Libc-alpha
2020-05-08 14:56 ` [PATCH v2 6/7] y2038: linux: Provide __ntp_gettime64 implementation Lukasz Majewski
2020-05-19 19:18 ` Adhemerval Zanella via Libc-alpha
2020-05-19 20:20 ` Lukasz Majewski
2020-05-19 20:25 ` Adhemerval Zanella via Libc-alpha [this message]
2020-05-20 15:23 ` Joseph Myers
2020-05-20 17:08 ` Lukasz Majewski
2020-05-20 17:21 ` Joseph Myers
2020-05-21 10:31 ` Lukasz Majewski
2020-05-08 14:56 ` [PATCH v2 7/7] y2038: linux: Provide __ntp_gettimex64 implementation Lukasz Majewski
2020-05-19 19:19 ` Adhemerval Zanella via Libc-alpha
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=6676f4f7-3287-e80a-a9a6-2ec877b0abe4@linaro.org \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=lukma@denx.de \
--cc=schwab@suse.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).