From patchwork Wed Jan 29 12:59:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1230884 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-109022-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha1 header.s=default header.b=Ui6XR4P+; 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 4873Wd0vp0z9sRY for ; Thu, 30 Jan 2020 00:01:00 +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:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=tJLDG1Ifq3loi+i5+X38x+EdWH5wDejHrU6vS081kb6c/FJVjVNMK ObAny2VvH4mGfPQJTQ0f1jA2sOW5XL8+rieRhiwoHBsUrrtcHE5jY0j3jzYj8awv hC3SvtLV1K3J90coyj5i9Tm4usiI0zszgBO61khR/+6WH8PinP4/TU= 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:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=/3BlmxGn6KscTcR2AZQKV79Ojz4=; b=Ui6XR4P+0LmpJ9uUdLPLOYl20VWq PBF0xCFvklq24IrasWAea7qVTitIFzXPAg5x4TtPQoZjmHr1MsZjNP2wF0mZ0FLP nAoqT/KIWDR/+oWE9LxfOjqHdjIcNrwmcY+6tzFbLMAQ1Tb9ellbvbR+kfoB51wm 6YhTnNzSCO34Lmo= Received: (qmail 32264 invoked by alias); 29 Jan 2020 12:59:53 -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 32171 invoked by uid 89); 29 Jan 2020 12:59:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy= X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Lukasz Majewski Subject: [PATCH v3 7/7] y2038: linux: Provide ___gettimeofday64 implementation Date: Wed, 29 Jan 2020 13:59:14 +0100 Message-Id: <20200129125914.11221-7-lukma@denx.de> In-Reply-To: <20200129125914.11221-1-lukma@denx.de> References: <20200129125914.11221-1-lukma@denx.de> MIME-Version: 1.0 In the glibc the gettimeofday can use vDSO (on power and x86 the USE_IFUNC_GETTIMEOFDAY is defined), gettimeofday syscall or 'default' ___gettimeofday() from ./time/gettime.c (as a fallback). In this patch the last function (___gettimeofday) has been reimplemented and moved to ./sysdeps/unix/sysv/linux/gettimeofday.c to be Linux specific. The new ___gettimeofday64 explicit 64 bit function for getting 64 bit time from the kernel (by internally calling __clock_gettime64) has been introduced. Moreover, a 32 bit version - ___gettimeofday has been refactored to internally use __gettimeofday64. The ___gettimeofday is now supposed to be used on systems still supporting 32 bit time (__TIMESIZE != 64) - hence the necessary check for time_t potential overflow and conversion of struct __timeval64 to 32 bit struct timespec. The alpha port is a bit problematic for this change - it supports 64 bit time and can safely use gettimeofday implementation from ./time/gettimeofday.c as it has ./sysdeps/unix/sysv/linux/alpha/gettimeofday.c, which includes ./time/gettimeofday.c, so the Linux specific one can be avoided. For that reason the code to set default gettimeofday symbol has not been moved to ./sysdeps/unix/sysv/linux/gettimeofday.c as only alpha defines VERSION_gettimeofday. 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 proper usage of both ___gettimeofday64 and __gettimeofday. --- Changes for v3: - New patch --- include/time.h | 4 +++ sysdeps/unix/sysv/linux/gettimeofday.c | 46 +++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 0345803db2..931c9a3bd7 100644 --- a/include/time.h +++ b/include/time.h @@ -227,10 +227,14 @@ libc_hidden_proto (__sched_rr_get_interval64); #if __TIMESIZE == 64 # define __settimeofday64 __settimeofday +# define ___gettimeofday64 ___gettimeofday #else extern int __settimeofday64 (const struct __timeval64 *tv, const struct timezone *tz); libc_hidden_proto (__settimeofday64) +extern int ___gettimeofday64 (struct __timeval64 *restrict tv, + void *restrict tz); +libc_hidden_proto (___gettimeofday64) #endif /* Compute the `struct tm' representation of T, diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c index d5cdb22495..728ef45eed 100644 --- a/sysdeps/unix/sysv/linux/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/gettimeofday.c @@ -54,5 +54,49 @@ __gettimeofday (struct timeval *restrict tv, void *restrict tz) # endif weak_alias (__gettimeofday, gettimeofday) #else /* USE_IFUNC_GETTIMEOFDAY */ -# include