From patchwork Thu Nov 7 18:11:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1191362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106781-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="FvkcsGZT"; dkim=pass (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="hhuqDV7X"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 478BSk6RcJz9s7T for ; Fri, 8 Nov 2019 05:17:10 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=Wrd yXbj4f7lBvKHKwVxHesJbgC9dIB5Pbh2jJozAS4dc/lIQfF6iDaa/GGc+6uypfjC Aa6lxyfnmuVif333lFo/O/8eYHS9hdZ4xw9Cwes2UQ/yz51cCNLktrEtatoUJy53 /T3HCFG99l7v8xTiWL7toiAhD3jeRSVnNSIqXBuw= 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:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=IL8zy3MX8 Kw9sQ/+RJsu4r7pa2c=; b=FvkcsGZTMulprt2nl5wVbQTBwqQWfSmq8rt3zCdvS eKC9d0QtXa65UFdfK7qtdBGcWXZeyyJKX42WUSOZsPFPpH5d2bhekJeQwSHD8atb 2e6M9VTlVJuV/aC62KpE/ImxS6G83vXVVcZ3VhsayRo5FkH4RPjXqV7DGvIQ4CNw RE= Received: (qmail 27400 invoked by alias); 7 Nov 2019 18:17:04 -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 Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 27391 invoked by uid 89); 7 Nov 2019 18:17:04 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy= X-HELO: esa6.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1573150623; x=1604686623; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=7APlRWdCgNemfWZfi0EM8wgwGdaqAd1Xl4w1KvhZOPM=; b=hhuqDV7Xcep7eHD2TtRNE6RIRyTOO+HSryf6eNlMmQU4wLgxktWdl4fO 4XP9uVsyfNNYXSzKhHxiL9ExDyQwKpe/MNWd234SAuT0WFPisxEk0VALX yB3TimmtrRk/nwj/6cKEyR2n18l7Gm+Nf5ALNfwTJkpPRwI+1Jor4vok1 LfTrBlwEL+i2md6TnbMYD7XZWWaziVlE70vIDY1AKeUZ0AJg9zFVo5N6k 3zC8lihOLPl9oT487rC6eHeqiOVve905lVmxPt82zFWyiRA+KUl377qxL ticNTPWlxWE4HjX7wwGzWBaryxS0cE0ZHQP6ExdNVq13r/2Rotx/rtgo/ Q==; IronPort-SDR: I7Z2/2CcUPdq4tcMBt0g3rhVs3kZXxy5ccBOxOJOXCyv6vzNanRXMGW/6vq4j2Tfa5ZMm+NcWF cRfAtot47/tFStYK1C8ov6pFnkRn9ggwIS5Ep33aBr+B2XzvhwpF6EV0OTlups5j4AzFYLXU8T 4E/+RUM4RcufwOydd6ZsEFqa2MqgvFKPqnbCglZzW7P/06AHd3yYrgFSKjH8bWyp5LmcqdfNtr Z9N21eL46F99Bqqk5TyRdYnxMKM4CxHrMT1lHIf8NNfK27ZtAQBjiFJ+z2vO1ahWTevAiGGCvm yIA= IronPort-SDR: v8MwPkSKYjBglx/5k4ybXf9NbObAez+CpzAjV2SpBndoEBJLiZpLYfOwfslyxFY+wfNYJ9+i/S wHfPKCXwhikkMuwx19fmgf/tERPyDOz1X69fnLvDbwbqmyvhY7KjEx1MLusRNOKn3cqHX1EpTg 7O7vjsw4AvDETRrKGwra0j9NKXC1R+5n8Et+Hm9jxdpwBVBsBqbRIvY54A7hU9evLYRN6b/UHe eILzH7NuHD1GZfp119RedFvmKgkg6MB/mLFJoaX2Y5wF0f+8NGH1CnvksTcvWgAnoE7XXDxSWW pDMXfKQ7cD5+OkSh6ve6yZE3 IronPort-SDR: hvoZAHqo2jRyy/AHQprcqxC763cHe/f8yjXlQZxXXckajBGZ4Yl0P3ZJgLr1jkrjbMubFcBYZP W7IQp5Sfh+uMfrMwF4JnIZOWeRr9V1TTxB8jijvPi5k/KH4D8R79YZtkQLsw43caFKimQ68Zxj NdLEUa4yD0GHv7RoEpiygwi/W6b1jFUrHjFw7zu3yUKV6+5eziAZDCO6USXesEYMIDSaCAi914 aT+DglGhDHvSX4ysMxpFKN+RrvPfP8SplWVFnXVZQU3lHexamj1JO5kr8xqVR440JgVvvw+68B +8Q= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v5] sysdeps/clock_nanosleep: Use clock_nanosleep_time64 if avaliable Date: Thu, 7 Nov 2019 10:11:42 -0800 Message-Id: <20191107181142.1048-1-alistair.francis@wdc.com> MIME-Version: 1.0 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 was 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 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 ` include/time.h | 20 +++++++ sysdeps/unix/sysv/linux/clock_nanosleep.c | 66 +++++++++++++++++++++-- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/include/time.h b/include/time.h index b3e635395db..03389bda290 100644 --- a/include/time.h +++ b/include/time.h @@ -209,6 +209,26 @@ libc_hidden_proto (__difftime64) extern double __difftime (time_t time1, time_t time0); +#if __TIMESIZE == 64 +# define __thrd_sleep_time64 thrd_sleep +# define __clock_nanosleep_time64 __clock_nanosleep +# define __nanosleep_time64 __nanosleep +# define __nanosleep_nocancel_time64 __nanosleep_nocancel +#else +extern int __thrd_sleep_time64 (const struct __timespec64* time_point, + struct __timespec64* remaining); +libc_hidden_proto (__thrd_sleep_time64) +extern int __clock_nanosleep_time64 (clockid_t clock_id, + int flags, const struct __timespec64 *req, + struct __timespec64 *rem); +libc_hidden_proto (__clock_nanosleep_time64) +extern int __nanosleep_time64 (const struct __timespec64 *requested_time, + struct __timespec64 *remaining); +libc_hidden_proto (__nanosleep_time64) +extern int __nanosleep_nocancel_time64 (const struct __timespec64 *requested_time, + struct __timespec64 *remaining); +libc_hidden_proto (__nanosleep_nocancel_time64) +#endif /* Use in the clock_* functions. Size of the field representing the actual clock ID. */ diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index f3c6fd2d5f7..7212dcf9c6d 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,64 @@ __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 */ + 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 || errno != ENOSYS) && rem) + *rem = valid_timespec_to_timespec64 (tr32); +#endif /* __ASSUME_TIME64_SYSCALLS */ + return (INTERNAL_SYSCALL_ERROR_P (r, err) - ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); + ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); } + +#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 || errno != ENOSYS) + { + if (rem) + *rem = valid_timespec64_to_timespec (trem64); + } + + 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;