From patchwork Fri Nov 8 17:03:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 35754 Received: (qmail 76484 invoked by alias); 8 Nov 2019 17:08:29 -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 76412 invoked by uid 89); 8 Nov 2019 17:08:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.7 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=1573232907; x=1604768907; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=m18HRYNWP6QVYo8KPuQ3hcqV/7QVcI5OQKXNLlAGUD0=; b=KFk82DRhlWkcP+PbZ0IvLoxw+XrEV45CiG0ffGyiwHOpOYHD0pxglBwI 2Nu6mfHhdD4R1WUkmyyEYNlXxsZY4T0jPC9lh0M5uPFiC128I4qoSPHCd PyMjH6qnL5/goq4seKoreDvFTSb5fm7sfHthleE9mAlqrT/JmrT6yicBW k35twPgF/GvT42HRHVqNukEh+18T1Va0KBZL5YufchueCYnzbDHn6WhXK 8qBWLSHyyqC9Cv4XGhScySp6VR7K2GjjFk9Sv/SYjvirI6HWPMqbsnaFa IJ6LT5X9NNTr0uDd4viP51yFmQagOuLb9q97rUYo5vcgi5hcCRlAcz5vO A==; IronPort-SDR: mkNynLsY6Wkyc9319mtG6wcD9Cs/UckIWdFZhWoEbD4pcwuMA7O5o7q6LGOu0rnKwK7Or33YR2 ooYm1MJHDGllZSsVwKKapBK96pH8EW0Mr9dPjlQ/OvviaDLCvKO5pfL6hKeHInkINHZZbw5orm EHIIp04Ywbyov6zRexk3ozW9Uwsra91b6N4q8ySRiMP08SkESns8cN4KNOus7eKWEjU7gGx+2x nssBUSJ6wCw2oVmEe5SIdVQR6NI5aYnmHsRbzi23iaVlZgtmrZbsXB0UqFOLPnkMVIyqusnIkJ Gfs= IronPort-SDR: 2KZwogAfGX/zwNXhejpHy5RJzSipMxNkNrNw06uuI3ae3Jt6FlNsKzlkkKC4v8HTOr7nUE9c5s AdU45QvC6wDEJUj02dwhDaph/YmuGFhTzRn9sKzsRy2cRXv2Y8xYh1X72Y+E45zxStl7CgMEvG Pn7cG3u8E5l0QVuvieMCGoWDyys/Ukh+y9CoQNBMdXbpUoZ9xlbS244sD6uUotnfqeYgH+l9o5 vzh4FNTPdsQYa5exx0lZufjVUHYkxR2Q/xtCg09dzgIlk2wEaE1AHSRHo7F+4oHw2HPN+uUvb9 m1w3rahoYY4m3DCcd1aRfqws IronPort-SDR: Vw68RwWusYwQNAPwB1wQwrmPJNh/m34QY+G6XqDMs42h2Mk0GW7BeNZxxRKbVDJqjuP2dm7vYO bc/wQLmkl3hN7qtolIi1gIKBpc5ijaI6m1R0PzDoBOlyn4xcWwVd+OBvcnxoxgcuJk03boPOJQ q084H8pAgpNmwOdBQ5uidUt3/Ij4X/49WXFLfeFPRqY1xExm7EOEhDtJfIXNu8aDDEHoX/j147 f4CUsgC9L5j8cYIPW4Mi9qksASfCCUyBaYuq+0BTV7AdrMtqoTeVzc1WMx6m7FbEYO/xxLWlxp mTE= WDCIronportException: Internal From: Alistair Francis To: libc-alpha@sourceware.org Cc: alistair23@gmail.com, Alistair Francis Subject: [PATCH v6 1/3] sysdeps/clock_nanosleep: Use clock_nanosleep_time64 if avaliable Date: Fri, 8 Nov 2019 09:03:00 -0800 Message-Id: <20191108170302.29838-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 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 ` 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. */ 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 */ + 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); } + +#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); + + 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;