From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 21E501F55B for ; Tue, 19 May 2020 19:18:35 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 07F503938C14; Tue, 19 May 2020 19:18:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07F503938C14 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1589915914; bh=sfZzJPf9KH4c0/4zbimx7BdzLohjQLj0g8zkg+zo8a4=; h=To:References:Subject:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=BHmtrsyYYBNqYpZRMH7rEUbfymtdthyE4LhlRAzV5sfFXhzNwujj7x//7Y2/Done4 kgkBUo0SnolnK3Pc1YiGGKlQlBvIGCb1DRjUI3idG05Cg7dHoQk4/YTs3LjhOxJLsC UHI30KIxCLxa0rUpWrusUfhzlxCmNxd1KIKBAt38= Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by sourceware.org (Postfix) with ESMTPS id 2B3FE3851C10 for ; Tue, 19 May 2020 19:18:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2B3FE3851C10 Received: by mail-qk1-x742.google.com with SMTP id f83so754916qke.13 for ; Tue, 19 May 2020 12:18:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:autocrypt:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=sfZzJPf9KH4c0/4zbimx7BdzLohjQLj0g8zkg+zo8a4=; b=QIut8wqa3PJNdp1ThcRp2EdnIEQiZR/ay18BQFWDnesRN95XC+WYZhI3R4BOIPGKII DoBHhjjv2Y9eV87a671896l0SxHNk+GZhJYkYYIKnCwGAtE29CNvdHSPl6SjXBdrSKYE YuHwozqik+tYU+DtUH3xdjPXmpRJNhIYQ3b3zcv1QCTJ6ywtjpXfSqxrxpCivsv5ag5A GeuHtx1oOthT5zRaOX75X4kDB7Ab5O6nhHwT0ejsH8p6U27CPLoo+rp9RqqfeTlFxsm4 GxbF3NQ2DMJYgRjCGBZGXI/LkXqidUm/g0s9O1NBdEqof5ud84m5O64uLsoCzqWZxDaH qMcw== X-Gm-Message-State: AOAM533tQVkoRkN9cJnzI2K6gGK9npj0jLuLPG7U18Ddlp6DPUgX7E5Y sJ0YBxjNxTgXGxjsm+Pj4IHr7g== X-Google-Smtp-Source: ABdhPJxwZN5o2kUblc0LayI4tShNzZ/FuEl/nDdP3X/WvuqLxEOCsaPF/db5uYxuyRfZEveLlQ5fww== X-Received: by 2002:a37:496:: with SMTP id 144mr1018972qke.50.1589915910667; Tue, 19 May 2020 12:18:30 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id e28sm355882qka.125.2020.05.19.12.18.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 May 2020 12:18:30 -0700 (PDT) To: Lukasz Majewski , Joseph Myers References: <20200508145640.16336-1-lukma@denx.de> <20200508145640.16336-7-lukma@denx.de> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Subject: Re: [PATCH v2 6/7] y2038: linux: Provide __ntp_gettime64 implementation Message-ID: <1cb96b4a-3e56-0b31-32f4-136be4d7ae10@linaro.org> Date: Tue, 19 May 2020 16:18:26 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200508145640.16336-7-lukma@denx.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Cc: Florian Weimer , GNU C Library , Alistair Francis , Andreas Schwab Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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 > --- > 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 > #include > > #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? > + > +#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.