From patchwork Wed May 29 16:18:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 32899 Received: (qmail 8037 invoked by alias); 29 May 2019 16:19:19 -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 7953 invoked by uid 89); 29 May 2019 16:19:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy= X-HELO: mail-out.m-online.net From: Lukasz Majewski To: libc-alpha@sourceware.org Cc: Stepan Golosunov , Arnd Bergmann , Paul Eggert , Joseph Myers , Lukasz Majewski Subject: [PATCH v5 2/3] y2038: Provide conversion helpers for struct __timespec64 Date: Wed, 29 May 2019 18:18:49 +0200 Message-Id: <20190529161850.30442-3-lukma@denx.de> In-Reply-To: <20190529161850.30442-1-lukma@denx.de> References: <20190529161850.30442-1-lukma@denx.de> Those functions allow easy conversion between Y2038 safe struct __timespec64 and other time related data structures (like struct timeval). Moreover, those functions are NOT compiled when 64 bit time support is enabled (i.e. the __ASSUME_TIME64_SYSCALLS is defined) and are used only in 32 bit wrappers (like e.g. __clock_settime()). * include/time.h (valid_timeval_to_timespec64): Add. * include/time.h (valid_timespec_to_timespec64): Likewise. * include/time.h (valid_timespec64_to_timespec): Likewise. * include/time.h (valid_timespec64_to_timeval): Likewise. * include/time.h (IS_VALID_NANOSECONDS): Likewise. * include/time.h (timespec_to_timespec64): Likewise. * include/time.h (timespec64_to_timespec): Likewise. * include/time.h (timespec64_to_timeval): Likewise. --- Changes for v5: - This code is now only compiled in when __ASSUME_TIME64_SYSCALLS is NOT defined. Previously it was depending on #if __TIMESIZE != 64. Changes for v4: - None Changes for v3: - Remove misleading comments regarding clearing tv_pad values during conversion (as Linux kernel on its own ignores upper 32 bits of tv_nsec). Changes for v3: - Remove timespec64_clear_padding function - as kernel ignores upper 32 bits of tv_nsec when passed via syscall to the Linux kernel Changes for v2: - Add timespec64_clear_padding function --- include/time.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/include/time.h b/include/time.h index 33d0fcb0fe..1b38d019c8 100644 --- a/include/time.h +++ b/include/time.h @@ -181,5 +181,90 @@ in_time_t_range (__time64_t t) return s == t; } +# ifndef __ASSUME_TIME64_SYSCALLS +/* Convert a known valid struct timeval into a struct __timespec64. */ +static inline void +valid_timeval_to_timespec64 (const struct timeval *tv32, + struct __timespec64 *ts64) +{ + ts64->tv_sec = tv32->tv_sec; + ts64->tv_nsec = tv32->tv_usec * 1000; +} + +/* Convert a known valid struct timespec into a struct __timespec64. */ +static inline void +valid_timespec_to_timespec64 (const struct timespec *ts32, + struct __timespec64 *ts64) +{ + ts64->tv_sec = ts32->tv_sec; + ts64->tv_nsec = ts32->tv_nsec; +} + +/* Convert a known valid struct __timespec64 into a struct timespec. */ +static inline void +valid_timespec64_to_timespec (const struct __timespec64 *ts64, + struct timespec *ts32) +{ + ts32->tv_sec = (time_t) ts64->tv_sec; + ts32->tv_nsec = ts64->tv_nsec; +} + +/* Convert a known valid struct __timespec64 into a struct timeval. */ +static inline void +valid_timespec64_to_timeval (const struct __timespec64 *ts64, + struct timeval *tv32) +{ + tv32->tv_sec = (time_t) ts64->tv_sec; + tv32->tv_usec = ts64->tv_nsec / 1000; +} + +/* Check if a value lies with the valid nanoseconds range. */ +#define IS_VALID_NANOSECONDS(ns) ((ns) >= 0 && (ns) <= 999999999) + +/* Check and convert a struct timespec into a struct __timespec64. */ +static inline bool +timespec_to_timespec64 (const struct timespec *ts32, + struct __timespec64 *ts64) +{ + /* Check that ts32 holds a valid count of nanoseconds. */ + if (! IS_VALID_NANOSECONDS (ts32->tv_nsec)) + return false; + /* All ts32 fields can fit in ts64, so copy them. */ + valid_timespec_to_timespec64 (ts32, ts64); + return true; +} + +/* Check and convert a struct __timespec64 into a struct timespec. */ +static inline bool +timespec64_to_timespec (const struct __timespec64 *ts64, + struct timespec *ts32) +{ + /* Check that tv_nsec holds a valid count of nanoseconds. */ + if (! IS_VALID_NANOSECONDS (ts64->tv_nsec)) + return false; + /* Check that tv_sec can fit in a __time_t. */ + if (! in_time_t_range (ts64->tv_sec)) + return false; + /* All ts64 fields can fit in ts32, so copy them. */ + valid_timespec64_to_timespec (ts64, ts32); + return true; +} + +/* Check and convert a struct __timespec64 into a struct timeval. */ +static inline bool +timespec64_to_timeval (const struct __timespec64 *ts64, + struct timeval *tv32) +{ + /* Check that tv_nsec holds a valid count of nanoseconds. */ + if (! IS_VALID_NANOSECONDS (ts64->tv_nsec)) + return false; + /* Check that tv_sec can fit in a __time_t. */ + if (! in_time_t_range (ts64->tv_sec)) + return false; + /* All ts64 fields can fit in tv32, so copy them. */ + valid_timespec64_to_timeval (ts64, tv32); + return true; +} +# endif #endif #endif