From patchwork Fri May 8 14:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 38937 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7D14F3972464; Fri, 8 May 2020 14:57:08 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) by sourceware.org (Postfix) with ESMTPS id CDA8F3851C02 for ; Fri, 8 May 2020 14:57:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CDA8F3851C02 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 49JYMP0Nhtz1rspk; Fri, 8 May 2020 16:57:05 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 49JYMP05tLz1r79j; Fri, 8 May 2020 16:57:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id LHvw82L476Rg; Fri, 8 May 2020 16:57:03 +0200 (CEST) X-Auth-Info: DlZtODGdEulGb6bJHcp/E2aDsgR4py4TDQuTx8hDVS4= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 8 May 2020 16:57:02 +0200 (CEST) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella Subject: [PATCH v2 3/7] y2038: linux: Provide __adjtime64 implementation Date: Fri, 8 May 2020 16:56:36 +0200 Message-Id: <20200508145640.16336-4-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200508145640.16336-1-lukma@denx.de> References: <20200508145640.16336-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-23.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , GNU C Library , Andreas Schwab , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This patch provides new __adjtime64 explicit 64 bit function for adjusting Linux kernel clock. Internally, the __clock_adjtime64 syscall is used instead of __adjtimex. This patch is necessary for having architectures with __WORDSIZE == 32 Y2038 safe. Moreover, a 32 bit version - __adjtime has been refactored to internally use __adjtime64. The __adjtime is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary conversions between struct timeval and 64 bit struct __timeval64. Build tests: ./src/scripts/build-many-glibcs.py glibcs Run-time tests: - Run specific tests on ARM/x86 32bit systems (qemu): https://github.com/lmajewski/meta-y2038 and run tests: https://github.com/lmajewski/y2038-tests/commits/master Above tests were performed with Y2038 redirection applied as well as without to test the proper usage of both __adjtime64 and __adjtime. Reviewed-by: Alistair Francis Reviewed-by: Adhemerval Zanella --- include/sys/time.h | 9 +++++++++ sysdeps/unix/sysv/linux/adjtime.c | 26 ++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/include/sys/time.h b/include/sys/time.h index 8153d75033..567e4b7562 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -26,6 +26,15 @@ extern int __settimezone (const struct timezone *__tz) attribute_hidden; extern int __adjtime (const struct timeval *__delta, struct timeval *__olddelta); + +# include +# if __TIMESIZE == 64 +# define __adjtime64 __adjtime +# else +extern int __adjtime64 (const struct __timeval64 *itv, + struct __timeval64 *otv); +libc_hidden_proto (__adjtime64) +# endif extern int __getitimer (enum __itimer_which __which, struct itimerval *__value); extern int __setitimer (enum __itimer_which __which, diff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c index c142f4f6ea..3f9a4ea2eb 100644 --- a/sysdeps/unix/sysv/linux/adjtime.c +++ b/sysdeps/unix/sysv/linux/adjtime.c @@ -24,13 +24,13 @@ #define MIN_SEC (INT_MIN / 1000000L + 2) int -__adjtime (const struct timeval *itv, struct timeval *otv) +__adjtime64 (const struct __timeval64 *itv, struct __timeval64 *otv) { - struct timex tntx; + struct __timex64 tntx; if (itv) { - struct timeval tmp; + struct __timeval64 tmp; /* We will do some check here. */ tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L; @@ -43,7 +43,7 @@ __adjtime (const struct timeval *itv, struct timeval *otv) else tntx.modes = ADJ_OFFSET_SS_READ; - if (__glibc_unlikely (__adjtimex (&tntx) < 0)) + if (__glibc_unlikely (__clock_adjtime64 (CLOCK_REALTIME, &tntx) < 0)) return -1; if (otv) @@ -62,6 +62,24 @@ __adjtime (const struct timeval *itv, struct timeval *otv) return 0; } +#if __TIMESIZE != 64 +libc_hidden_def (__adjtime64) + +int +__adjtime (const struct timeval *itv, struct timeval *otv) +{ + struct __timeval64 itv64, otv64; + int retval; + + itv64 = valid_timeval_to_timeval64 (*itv); + retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL); + if (otv != NULL) + *otv = valid_timeval64_to_timeval (otv64); + + return retval; +} +#endif + #ifdef VERSION_adjtime weak_alias (__adjtime, __wadjtime); default_symbol_version (__wadjtime, adjtime, VERSION_adjtime);