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=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 61EDD1F55B for ; Tue, 19 May 2020 19:58:30 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 72FA739494B4; Tue, 19 May 2020 19:58:29 +0000 (GMT) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 25B9E394849E for ; Tue, 19 May 2020 19:58:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 25B9E394849E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49RRX06ZSkz1qrMc; Tue, 19 May 2020 21:58:24 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49RRX05wHpz1qtwT; Tue, 19 May 2020 21:58:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id JUkSGeTBtxdb; Tue, 19 May 2020 21:58:22 +0200 (CEST) X-Auth-Info: 2NNsOl+5qWJVYDrOIj8SfxgL/tU75vRJQXXVhnnA9Wc= Received: from jawa (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 19 May 2020 21:58:22 +0200 (CEST) Date: Tue, 19 May 2020 21:58:21 +0200 From: Lukasz Majewski To: Adhemerval Zanella Subject: Re: [PATCH v2 1/7] y2038: linux: Provide __clock_adjtime64 implementation Message-ID: <20200519215821.12da6029@jawa> In-Reply-To: <4450aefc-079f-d73d-5c70-ce8ed54b777b@linaro.org> References: <20200508145640.16336-1-lukma@denx.de> <20200508145640.16336-2-lukma@denx.de> <4450aefc-079f-d73d-5c70-ce8ed54b777b@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/iOpcf_IY2h..WywbxWV04ZX"; protocol="application/pgp-signature" 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: , Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis , Joseph Myers Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --Sig_/iOpcf_IY2h..WywbxWV04ZX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Adhemerval, > On 08/05/2020 11:56, Lukasz Majewski wrote: > > This patch replaces auto generated wrapper (as described in > > sysdeps/unix/sysv/linux/syscalls.list) for clock_adjtime with one > > which adds extra support for reading 64 bit time values on machines > > with __TIMESIZE !=3D 64. > >=20 > > To achieve this goal new __clock_adjtime64 explicit 64 bit function > > for adjusting Linux clock has been added. > > Moreover, a 32 bit version - __clock_adjtime has been refactored to > > internally use __clock_adjtime64. > >=20 > > The __clock_adjtime is now supposed to be used on systems still > > supporting 32 bit time (__TIMESIZE !=3D 64) - hence the necessary > > conversions between 64 bit struct __timespec64 and struct timespec. > >=20 > > The new __clock_adjtime64 syscall available from Linux 5.1+ has > > been used, when applicable. > > Up till v5.4 in the Linux kernel there was a bug preventing this > > call from obtaining correct struct's timex time.tv_sec time after > > time_t overflow (i.e. not being Y2038 safe). > >=20 > > Build tests: > > - ./src/scripts/build-many-glibcs.py glibcs > >=20 > > 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 > >=20 > > Linux kernel, headers and minimal kernel version for glibc build > > test matrix: > > - Linux v5.1 (with clock_adjtime64) and glibc build with v5.1 as > > minimal kernel version (--enable-kernel=3D"5.1.0") > > The __ASSUME_TIME64_SYSCALLS flag defined. > >=20 > > - Linux v5.1 and default minimal kernel version > > The __ASSUME_TIME64_SYSCALLS not defined, but kernel supports > > clock_adjtime64 syscall. > >=20 > > - Linux v4.19 (no clock_adjtime64 support) with default minimal > > kernel version for contemporary glibc (3.2.0) > > This kernel doesn't support clock_adjtime64 syscall, so the > > fallback to clock_adjtime is tested. > >=20 > > Above tests were performed with Y2038 redirection applied as well > > as without (so the __TIMESIZE !=3D 64 execution path is checked as > > well). > >=20 > > No regressions were observed. > >=20 > > Changes for v2: > > - Fix wrong indentation > > - Remove the check for (ret >=3D TIME_OK && ret <=3D TIME_ERROR) in the > > clock_adjtime64 call - just check if syscall returned ENOSYS > > - Add 64 bit time overflow for ADJ_SETOFFSET set in modes =20 >=20 > Ok with the changes below. >=20 > Reviewed-by: Adhemerval Zanella >=20 > > --- > > sysdeps/unix/sysv/linux/Makefile | 2 +- > > sysdeps/unix/sysv/linux/clock_adjtime.c | 71 > > +++++++++++++++++++++ sysdeps/unix/sysv/linux/include/sys/timex.h | > > 3 + sysdeps/unix/sysv/linux/syscalls.list | 1 - > > 4 files changed, 75 insertions(+), 2 deletions(-) > > create mode 100644 sysdeps/unix/sysv/linux/clock_adjtime.c > >=20 > > diff --git a/sysdeps/unix/sysv/linux/Makefile > > b/sysdeps/unix/sysv/linux/Makefile index 0326f92c40..2f2fd5d4d0 > > 100644 --- a/sysdeps/unix/sysv/linux/Makefile > > +++ b/sysdeps/unix/sysv/linux/Makefile > > @@ -60,7 +60,7 @@ sysdep_routines +=3D adjtimex clone umount umount2 > > readahead sysctl \ personality epoll_wait tee vmsplice splice \ > > open_by_handle_at mlock2 pkey_mprotect pkey_set > > pkey_get \ timerfd_gettime timerfd_settime prctl \ > > - process_vm_readv process_vm_writev > > + process_vm_readv process_vm_writev clock_adjtime > > =20 > > CFLAGS-gethostid.c =3D -fexceptions > > CFLAGS-tee.c =3D -fexceptions -fasynchronous-unwind-tables =20 >=20 > Ok. >=20 > > diff --git a/sysdeps/unix/sysv/linux/clock_adjtime.c > > b/sysdeps/unix/sysv/linux/clock_adjtime.c new file mode 100644 > > index 0000000000..5c02031bb5 > > --- /dev/null > > +++ b/sysdeps/unix/sysv/linux/clock_adjtime.c > > @@ -0,0 +1,71 @@ > > +/* clock_adjtime -- tune kernel clock =20 >=20 > I think we usually add a final period in one line description. Ok. >=20 > > + 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 . */ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +int > > +__clock_adjtime64 (const clockid_t clock_id, struct __timex64 > > *tx64) +{ > > +#ifdef __ASSUME_TIME64_SYSCALLS > > +# ifndef __NR_clock_adjtime64 > > +# define __NR_clock_adjtime64 __NR_clock_adjtime > > +# endif > > + return INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, > > tx64); +#else > > + int ret =3D INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); > > + if (errno !=3D ENOSYS) > > + return ret; > > + > > + if (tx64->modes & ADJ_SETOFFSET > > + && ! in_time_t_range (tx64->time.tv_sec)) > > + { > > + __set_errno (EOVERFLOW); > > + return -1; > > + } > > + > > + struct timex tx32 =3D valid_timex64_to_timex (*tx64); > > + int retval =3D INLINE_SYSCALL_CALL (clock_adjtime, clock_id, > > &tx32); > > + *tx64 =3D valid_timex_to_timex64 (tx32);> + > > + return retval; =20 >=20 > The function might still return EINVAL for invalid clocks, ENODEV for > invalid dynamic ones, EOPNOTSUPP if the clock does not support > adjustment, or EPERM if buf.modes is neither 0 nor ADJ_OFFSET_SS_READ > and the caller does not have sufficient privilege. >=20 > So we still need to check the syscall return value prior setting the > tx64 value: >=20 > int retval =3D INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); > if (retval >=3D 0) > *tx64 =3D valid_timex_to_timex64 (tx32); > return retval; >=20 Thanks for pointing this out. > Ok with this change. >=20 > > +#endif > > +} > > + > > +#if __TIMESIZE !=3D 64 > > +libc_hidden_def (__clock_adjtime64) > > + > > +int > > +__clock_adjtime (const clockid_t clock_id, struct timex *tx) > > +{ > > + struct __timex64 tx64; > > + int retval; > > + > > + tx64 =3D valid_timex_to_timex64 (*tx); > > + retval =3D __clock_adjtime64 (clock_id, &tx64); =20 >=20 > Same as before, we need to check its return value prior setting TX: >=20 > retval =3D __clock_adjtime64 (clock_id, &tx64); > if (retval >=3D 0) > *tx =3D valid_timex64_to_timex (tx64); > return retval; >=20 > Ok with this change. > =20 > > + *tx =3D valid_timex64_to_timex (tx64); > > + > > + return retval; > > +} > > +#endif > > +libc_hidden_def (__clock_adjtime); > > +strong_alias (__clock_adjtime, clock_adjtime) =20 >=20 > Ok. >=20 > > diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h > > b/sysdeps/unix/sysv/linux/include/sys/timex.h index > > 3efe7cd306..2848c5cf76 100644 --- > > a/sysdeps/unix/sysv/linux/include/sys/timex.h +++ > > b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -30,6 +30,7 @@ > > libc_hidden_proto (__adjtimex) /* Local definition of 64 bit time > > supporting timex struct */ # if __TIMESIZE =3D=3D 64 > > # define __timex64 timex > > +# define __clock_adjtime64 __clock_adjtime > > # else > > =20 > > struct __timex64 > > @@ -71,6 +72,8 @@ struct __timex64 > > int :32; > > int :32; > > }; > > +extern int __clock_adjtime64 (const clockid_t clock_id, struct > > __timex64 *tx64); +libc_hidden_proto (__clock_adjtime64); > > # endif > > =20 > > /* Convert a known valid struct timex into a struct __timex64. */ > > =20 >=20 > Ok. >=20 > > diff --git a/sysdeps/unix/sysv/linux/syscalls.list > > b/sysdeps/unix/sysv/linux/syscalls.list index > > 1d8893d1b8..01ec2bfa95 100644 --- > > a/sysdeps/unix/sysv/linux/syscalls.list +++ > > b/sysdeps/unix/sysv/linux/syscalls.list @@ -4,7 +4,6 @@ > > alarm - alarm i:i alarm > > bdflush EXTRA bdflush > > i:ii __compat_bdflush bdflush@GLIBC_2.0:GLIBC_2.23 > > capget EXTRA capget > > i:pp capget capset EXTRA capset > > i:pp capset -clock_adjtime EXTRA > > clock_adjtime i:ip __clock_adjtime > > clock_adjtime create_module EXTRA > > create_module 3 __compat_create_module > > create_module@GLIBC_2.0:GLIBC_2.23 delete_module > > EXTRA delete_module 3 delete_module > > epoll_create EXTRA epoll_create i:i > > epoll_create=20 >=20 > 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 --Sig_/iOpcf_IY2h..WywbxWV04ZX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAl7EOl0ACgkQAR8vZIA0 zr2HRgf/X+PMJSmFY9McRSkjFInTqlGim05U6cUVeQ8E6HxqVy6vBpYInSZ+PJeu ujDrih49sKz3MsGEa58m3ftG96Cy1FIJCVTMrwPk+d8qrqWomjnE0LUSZwVWe34w bGBuzp1iVwZ7ij6sl52cGnyUMIp9fe2WhG4BC6MLMwuSkXi4zkhl7HcRgUITjqvp oOODraQhGY+CbAMUXHlTocOc15aHCbBPdFtSPnqbmRjHtjU615sANOLayCJzeX1V EpK/pdDlMrVy7ZAK7RWr+fGm74S3E+J7dlP8LBCmXBNSLxOwPCl0c/QFg144tn0u 7adAst+E50VZCNsD4jgucuueh02IPA== =/hkx -----END PGP SIGNATURE----- --Sig_/iOpcf_IY2h..WywbxWV04ZX--