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-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 567351F463 for ; Mon, 6 Jan 2020 20:34:41 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:cc:references:from:subject:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=GPQB8okGSe7ZdVy7 utNNeiSyFenMoWk1RI59j6n03t3OEQrq3yqCFGwrc0xcjBgFe6WXRu5wrdl1n1fE kTeh1GTGTXnmq59GwZ04O63LenjgAw0Pk6XmKJuPOcmwNOum16R+3GTW91QZHMo+ TcIjUq4Tug/a4/KfLWI1FJo5/f4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:cc:references:from:subject:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; s=default; bh=kgqCD4te6Afx+3P7+JreB+ vq4eU=; b=NeK1r3LsISC0rY0jJ/J8TyOYdKp2lG8Ko8/phcJPdzIUjkyWk2V30o o5bNcEp0TgUUnEDUtvHoq5JylaYn0RAQARv+XqnerycuNNH6oZ8qafOrplvpmXko B6ts/UkTWb050cC0xCEdbQN6gfkq0aWFc9wspxxqbaIvOl7mhR2mw= Received: (qmail 82943 invoked by alias); 6 Jan 2020 20:34:37 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 82934 invoked by uid 89); 6 Jan 2020 20:34:37 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-qk1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:cc:references:from:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=lXOn4NEwnzr/xgNWNQMgwkxrRLyNzAyYuajnPTbGbDU=; b=mnZ0ummPI3AHQ2NdAZRkyHLjc3W8QL7xbC4A+/O73HjaNB0cfvzSHwUOFyyBFit7Ds IM6L/7T93MqRuShT3Q0+5YrFZ498xqEmWslJ9LZWN0gyUH07KiFSdVmYJMqySCFcsHQc TfK9P8pKoWdkhss0oKpbJQ7AQp++RuUalnLyn7jTlcT2L/VkZlzLdpaJKD2ft+q0Yfc4 bdZKBekO1/GQitu5d6/fP7LOMepWBovrCaKoKzUUq5cyHiJW2+Qm5DixyQCa7y0NRkS0 0AbzcU3Nooq0IM7COcd9vEewgWtbtD+wWc50iJ4nmn3poNHKjuGKY6yC+iRuwtl+i9yr HvFA== To: Lukasz Majewski , Joseph Myers , Paul Eggert , Andreas Schwab Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell References: <20200106121742.1628-1-lukma@denx.de> From: Adhemerval Zanella Subject: Re: [PATCH v4 1/2] y2038: linux: Provide __timerfd_gettime64 implementation Message-ID: Date: Mon, 6 Jan 2020 17:34:28 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200106121742.1628-1-lukma@denx.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit On 06/01/2020 09:17, Lukasz Majewski wrote: > This patch replaces auto generated wrapper (as described in > sysdeps/unix/sysv/linux/syscalls.list) for timerfd_gettime with one which > adds extra support for reading 64 bit time values on machines with > __TIMESIZE != 64. > There is no functional change for architectures already supporting 64 bit > time ABI. > > This patch is conceptually identical to timer_gettime conversion already > done in sysdeps/unix/sysv/linux/timer_gettime.c. > Please refer to corresponding commit message for detailed description of > introduced functions and the testing procedure. > > --- > Changes for v4: > - Update date from 2019 to 2020 > > Changes for v3: > - Add missing libc_hidden_def() > > Changes for v2: > - Remove "Contributed by" from the file header > - Remove early check for (fd < 0) in __timerfd_gettime64 as the fd > correctness check is already done in Linux kernel > - Add single descriptive comment line to provide concise explanation > of the code LGTM when 2.32 opens, thanks. Reviewed-by: Adhemerval Zanella > --- > include/time.h | 3 + > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/syscalls.list | 1 - > sysdeps/unix/sysv/linux/timerfd_gettime.c | 68 +++++++++++++++++++++++ > 4 files changed, 73 insertions(+), 2 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/timerfd_gettime.c > > diff --git a/include/time.h b/include/time.h > index e5e8246eac..eb5082b4d7 100644 > --- a/include/time.h > +++ b/include/time.h > @@ -181,9 +181,12 @@ libc_hidden_proto (__futimens64); > > #if __TIMESIZE == 64 > # define __timer_gettime64 __timer_gettime > +# define __timerfd_gettime64 __timerfd_gettime > #else > extern int __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value); > +extern int __timerfd_gettime64 (int fd, struct __itimerspec64 *value); > libc_hidden_proto (__timer_gettime64); > +libc_hidden_proto (__timerfd_gettime64); > #endif > > #if __TIMESIZE == 64 Ok. > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index f12b7b1a2d..74923740b9 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -60,7 +60,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead \ > setfsuid setfsgid epoll_pwait signalfd \ > eventfd eventfd_read eventfd_write prlimit \ > personality epoll_wait tee vmsplice splice \ > - open_by_handle_at mlock2 pkey_mprotect pkey_set pkey_get > + open_by_handle_at mlock2 pkey_mprotect pkey_set pkey_get \ > + timerfd_gettime > > CFLAGS-gethostid.c = -fexceptions > CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables Ok. > diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list > index 5f1352ad43..adb9055ce2 100644 > --- a/sysdeps/unix/sysv/linux/syscalls.list > +++ b/sysdeps/unix/sysv/linux/syscalls.list > @@ -94,7 +94,6 @@ mq_setattr - mq_getsetattr i:ipp mq_setattr > > timerfd_create EXTRA timerfd_create i:ii timerfd_create > timerfd_settime EXTRA timerfd_settime i:iipp timerfd_settime > -timerfd_gettime EXTRA timerfd_gettime i:ip timerfd_gettime > > fanotify_init EXTRA fanotify_init i:ii fanotify_init > Ok. > diff --git a/sysdeps/unix/sysv/linux/timerfd_gettime.c b/sysdeps/unix/sysv/linux/timerfd_gettime.c > new file mode 100644 > index 0000000000..7d09eeb11a > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/timerfd_gettime.c > @@ -0,0 +1,68 @@ > +/* timerfd_gettime -- get the timer setting referred to by file descriptor. > + 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 > + > +int > +__timerfd_gettime64 (int fd, struct __itimerspec64 *value) > +{ > +#ifdef __ASSUME_TIME64_SYSCALLS > +# ifndef __NR_timerfd_gettime64 > +# define __NR_timerfd_gettime64 __NR_timerfd_gettime > +# endif > + return INLINE_SYSCALL_CALL (timerfd_gettime64, fd, value); > +#else > +# ifdef __NR_timerfd_gettime64 > + int ret = INLINE_SYSCALL_CALL (timerfd_gettime64, fd, value); > + if (ret == 0 || errno != ENOSYS) > + return ret; > +# endif Ok. As a side note, now that arch-syscall patch is upstream should we assume that for !__ASSUME_TIME64_SYSCALLS the __NR_timerfd_gettime64 should be defined (meaning that Linux supports time64 for all 32-bit architectures)? > + struct itimerspec its32; > + int retval = INLINE_SYSCALL_CALL (timerfd_gettime, fd, &its32); > + if (retval == 0) > + { > + value->it_interval = valid_timespec_to_timespec64 (its32.it_interval); > + value->it_value = valid_timespec_to_timespec64 (its32.it_value); > + } > + > + return retval; > +#endif > +} Ok. > + > +#if __TIMESIZE != 64 > +libc_hidden_def (__timerfd_gettime64) Ok. As a side note, we should fix it on clock_{get,set}time to add the missing libc_hidden_def. > + > +int > +__timerfd_gettime (int fd, struct itimerspec *value) > +{ > + struct __itimerspec64 its64; > + int retval = __timerfd_gettime64 (fd, &its64); > + if (retval == 0) > + { > + value->it_interval = valid_timespec64_to_timespec (its64.it_interval); > + value->it_value = valid_timespec64_to_timespec (its64.it_value); > + } > + > + return retval; > +} > +#endif > +strong_alias (__timerfd_gettime, timerfd_gettime) > Ok.