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=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_GMAIL_RCVD, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,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 0DD6B1F454 for ; Fri, 8 Nov 2019 20:52:50 +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:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; q=dns; s=default; b=FEWX eBh6ZgyNYgEIYmnsEsU9v0x0qyeFaUvbSOeTAi5Y71QjFDFClQ5qY2NwigOtrIwR FHHi2urves6ebDhEdvtlORHGTJkNNKtvlmsvdHHrHVJCpcQUGuEaZzlRrhm8Mu/g 6wZCy9sRaG0MMGNHwWbOUUevFanjViHwT4ljLqo= 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:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; s=default; bh=ny8F+QUmjK MgkInWmBh3FanMxKE=; b=k43xh/mNKoh1yy8wSLZEbsp6t2xcIEGUPvBfV10mUm obfz1Dlkq2G4RJAk80nPIIH2qIK23ydr57AGLyzt97x5mYNe3OvRtHGYYEDfLRLc p9nmmdgwCCbkpqRlHAhE45WdGrSWfo5MhYSEcXLtqxSsVlMFIJu+wGa6s9RKYvdU E= Received: (qmail 82351 invoked by alias); 8 Nov 2019 20:52:48 -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 82335 invoked by uid 89); 8 Nov 2019 20:52:47 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-lj1-f196.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nMMDeuXxMYJA/StUD0T954WoiY3OIgBtI2L+hPnPLBE=; b=p6usx8u7sDUIOj9VoI4i89wuTc3IP0b19tlEHrZMRwTIcVHlRBO9EwSXB6u9EBUKFF 5+wtRcV//EE+uTwzTnps2LgCNEG8JcxFgwvBCW+VcWVZo9CsPKU5DlmUPDhglygxnZ3n TDi/kRfQrFFI7B1PVQxbgzNuA93QecwJuEw06AzjxSt/isszohkUXY6D26jUxz3xQtxw EgefRGbjYfaa6oZ8MbqDXx0zmaR7Vsat7ZESGdHw53JjjpV4B1FYTHVl75eXD67p04zz bv0dqcDCdVOm5mozSzpLctTrJCS9ZCdtNY340BCzty7Z7bUPF9L7t0LIRAqiRwVI9o44 mFeQ== MIME-Version: 1.0 References: <20191108170302.29838-1-alistair.francis@wdc.com> <8634c7cb-70c0-a4fc-f2d8-84ef921806b9@linaro.org> In-Reply-To: <8634c7cb-70c0-a4fc-f2d8-84ef921806b9@linaro.org> From: Alistair Francis Date: Fri, 8 Nov 2019 12:52:16 -0800 Message-ID: Subject: Re: [PATCH v6 1/3] sysdeps/clock_nanosleep: Use clock_nanosleep_time64 if avaliable To: Adhemerval Zanella Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" On Fri, Nov 8, 2019 at 11:01 AM Adhemerval Zanella wrote: > > > > On 08/11/2019 14:03, Alistair Francis wrote: > > The clock_nanosleep syscall is not supported on newer 32-bit platforms (such > > as RV32). To fix this issue let's use clock_nanosleep_time64 if it is > > avaliable. > > --- > > This patch was runtime tested with RV32 and RV64 > > It was build tested using the ./scripts/build-many-glibcs.py script. > > > > I also ran: > > $ make ; make install ; make check > > tests on native ARM (32-bit) with the following three confiugrations: > > - 4.19 Kernel and 4.19 Headers > > - 5.2 Kernel and 4.19 Headers > > - 5.2 Kernel and 5.2 Headers > > and didn't see any regressions > > > > v6: > > - Split header changes into seperate patches > > - Don't check for ENOSYS in the incorrect places > > - Don't change indendtation of file > > v5: > > - Fix clock_nanosleep syscall > > - Rebase on master > > > > v4: > > - Rebase on master > > - Use __clock_nanosleep to avoid duplicate implementations > > - Fix the error handling when a syscall fails > > v2: > > - Explicitly include `#include ` > > LGTM with a small nit below. Thanks, I have fixed the nit. Alistair > > > > > include/time.h | 8 +++ > > sysdeps/unix/sysv/linux/clock_nanosleep.c | 61 +++++++++++++++++++++-- > > 2 files changed, 65 insertions(+), 4 deletions(-) > > > > diff --git a/include/time.h b/include/time.h > > index b3e635395db..d7800eb30f8 100644 > > --- a/include/time.h > > +++ b/include/time.h > > @@ -209,6 +209,14 @@ libc_hidden_proto (__difftime64) > > > > extern double __difftime (time_t time1, time_t time0); > > > > +#if __TIMESIZE == 64 > > +# define __clock_nanosleep_time64 __clock_nanosleep > > +#else > > +extern int __clock_nanosleep_time64 (clockid_t clock_id, > > + int flags, const struct __timespec64 *req, > > + struct __timespec64 *rem); > > +libc_hidden_proto (__clock_nanosleep_time64) > > +#endif > > > > /* Use in the clock_* functions. Size of the field representing the > > actual clock ID. */ > > Ok. > > > diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c > > index f3c6fd2d5f7..903ed58e218 100644 > > --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c > > +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c > > @@ -16,6 +16,7 @@ > > . */ > > > > #include > > +#include > > #include > > > > #include > > @@ -26,9 +27,11 @@ > > /* We can simply use the syscall. The CPU clocks are not supported > > with this function. */ > > int > > -__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, > > - struct timespec *rem) > > +__clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec64 *req, > > + struct __timespec64 *rem) > > { > > + int r; > > + > > if (clock_id == CLOCK_THREAD_CPUTIME_ID) > > return EINVAL; > > if (clock_id == CLOCK_PROCESS_CPUTIME_ID) > > @@ -37,11 +40,61 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, > > /* If the call is interrupted by a signal handler or encounters an error, > > it returns a positive value similar to errno. */ > > INTERNAL_SYSCALL_DECL (err); > > - int r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags, > > - req, rem); > > + > > +#ifdef __ASSUME_TIME64_SYSCALLS > > +# ifndef __NR_clock_nanosleep_time64 > > +# define __NR_clock_nanosleep_time64 __NR_clock_nanosleep > > +# endif > > + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id, > > + flags, req, rem); > > +#else > > +# ifdef __NR_clock_nanosleep_time64 > > + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id, > > + flags, req, rem); > > + > > + if (r == 0 || errno != ENOSYS) > > + { > > + return (INTERNAL_SYSCALL_ERROR_P (r, err) > > + ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); > > + } > > +# endif /* __NR_clock_nanosleep_time64 */ > > Ok. > > > + struct timespec ts32, tr32; > > + > > + if (! in_time_t_range (req->tv_sec)) > > + { > > + __set_errno (EOVERFLOW); > > + return -1; > > + } > > + > > + ts32 = valid_timespec64_to_timespec (*req); > > + r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags, > > + &ts32, &tr32); > > + > > + if (r == 0 && rem) > > + *rem = valid_timespec_to_timespec64 (tr32); > > +#endif /* __ASSUME_TIME64_SYSCALLS */ > > + > > return (INTERNAL_SYSCALL_ERROR_P (r, err) > > ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); > > } > > Ok. > > > + > > +#if __TIMESIZE != 64 > > +int > > +__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, > > + struct timespec *rem) > > +{ > > + int r; > > + struct __timespec64 treq64, trem64; > > + > > + treq64 = valid_timespec_to_timespec64 (*req); > > + r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64); > > + > > + if (r == 0 && rem) > > + *rem = valid_timespec64_to_timespec (trem64); > > No implicit check on rem, use rem != NULL. > > > + > > + return r; > > +} > > +#endif > > libc_hidden_def (__clock_nanosleep) > > versioned_symbol (libc, __clock_nanosleep, clock_nanosleep, GLIBC_2_17); > > /* clock_nanosleep moved to libc in version 2.17; > >