From patchwork Wed Mar 27 08:52:04 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066737
Return-Path: 
 <libc-alpha-return-100902-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100902-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="O+fweBK8"; 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 44ThbK04WGz9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:52:44 +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; q=dns; s=default; b=Gf39JGHTM4SFWSpkrwgwDsh8r+oNOOA
	59NnDwa2uhYqDXUTL9+fbqdiWayWn171WuGnxQ/YIT6JuyUEeBxZSstasrfSG/41
	eYkDCVKBO/VcET3P62nAlvOjNksEz6AV19MGrnhxNY+xDXmsBqxJ2s+bg7ATu9ET
	evsEHoylQBeg=
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; s=default; bh=tscUOoMGtiuPb/4DtFu/foFCl+U=; b=O+fwe
	BK82zFFvZ7+11iBIiDQHpWJ8WR9wsPsFlDCSFDO4925V01kd1Q3x6S7LrWl5WhzM
	/5xevv9Pzt2RouubtQA9IUyV9fyis6x4n/LytPwBqZydw/66H/pT3VaYpyd4+EbW
	HbzSNZQqHht2MQMdJcyx8FiXAGHy5cwzL45D+A=
Received: (qmail 16246 invoked by alias); 27 Mar 2019 08:52:37 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 16229 invoked by uid 89); 27 Mar 2019 08:52:36 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-14.8 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=Seconds,
	half, prevent, H*Ad:D*edu
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 1/7] y2038: Introduce struct __timespec64
Date: Wed, 27 Mar 2019 09:52:04 +0100
Message-Id: <20190327085210.22019-2-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

This type is a glibc's type similar to struct timespec
but whose tv_sec field is a __time64_t rather than a time_t,
which makes it Y2038-proof and usable to pass between user
code and Y2038-proof kernel syscalls (e.g. clock_gettime()).

On 64-bit architectures, and on X32, struct __timespec64 is
just an alias of struct timespec, which is already 64-bit.
On other architectures, it must be explicitly defined.

When passing this structure to the kernel - it ensures that the
higher half of tv_nsec is always 0, which means that glibc
can reuse the public type (as tv_pad is zeroed anyway).

Moreover, the tv_nsec has an anonymous 32 bit padding (ordered
according to the endianness of the architecture) to prevent user space
programs, depending on long, 32 bit, tv_nsec from breaking.

Tested on x86_64 and ARM.

* time/bits/types/struct___timespec64.h:
  Create new file time/bits/types/struct___timespec64.h
* include/time.h: Add # include <time/bits/types/struct___timespec64.h>
* time/Makefile:
  Add bits/types/struct___timespec64.h to Makefile's headers
---
 include/time.h                        |  1 +
 time/Makefile                         |  2 +-
 time/bits/types/struct___timespec64.h | 39 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 time/bits/types/struct___timespec64.h

diff --git a/include/time.h b/include/time.h
index ac3163c2a5..d8a3ef35e2 100644
--- a/include/time.h
+++ b/include/time.h
@@ -5,6 +5,7 @@
 # include <bits/types/locale_t.h>
 # include <stdbool.h>
 # include <time/mktime-internal.h>
+# include <time/bits/types/struct___timespec64.h>
 
 extern __typeof (strftime_l) __strftime_l;
 libc_hidden_proto (__strftime_l)
diff --git a/time/Makefile b/time/Makefile
index 5c6304ece1..dc9ad55678 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -27,7 +27,7 @@ headers := time.h sys/time.h sys/timeb.h bits/time.h			\
 	   bits/types/struct_itimerspec.h				\
 	   bits/types/struct_timespec.h bits/types/struct_timeval.h	\
 	   bits/types/struct_tm.h bits/types/timer_t.h			\
-	   bits/types/time_t.h
+	   bits/types/time_t.h bits/types/struct___timespec64.h
 
 routines := offtime asctime clock ctime ctime_r difftime \
 	    gmtime localtime mktime time		 \
diff --git a/time/bits/types/struct___timespec64.h b/time/bits/types/struct___timespec64.h
new file mode 100644
index 0000000000..9946717af6
--- /dev/null
+++ b/time/bits/types/struct___timespec64.h
@@ -0,0 +1,39 @@
+/* NB: Include guard matches what <linux/time.h> uses.  */
+/* #ifndef _STRUCT_TIMESPEC
+# error "Never include <bits/types/struct___timespec64.h> directly !"
+#endif */
+
+#ifndef _STRUCT___TIMESPEC64
+#define _STRUCT___TIMESPEC64 1
+
+#include <bits/types.h>
+#include <bits/timesize.h>
+#include <endian.h>
+
+/* The glibc Y2038-proof structure for a time value.
+   To keep things Posix-ish, we keep the nanoseconds field a 32-bit
+   signed long, but since the Linux field is a 64-bit signed int, we
+   pad our tv_nsec with a 32-bit bitfield, which should always be 0.
+   */
+#if __TIMESIZE==64
+# define __timespec64 timespec
+#else
+#define TIMSPEC64_TV_PAD_DEFINED
+# if BYTE_ORDER == BIG_ENDIAN
+struct __timespec64
+{
+  __time64_t tv_sec;		/* Seconds */
+  int tv_pad: 32;		/* Padding named for checking/setting */
+  __syscall_slong_t tv_nsec;	/* Nanoseconds */
+};
+# else
+struct __timespec64
+{
+  __time64_t tv_sec;		/* Seconds */
+  __syscall_slong_t tv_nsec;	/* Nanoseconds */
+  int tv_pad: 32;		/* Padding named for checking/setting */
+};
+# endif
+#endif
+
+#endif

From patchwork Wed Mar 27 08:52:05 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066738
Return-Path: 
 <libc-alpha-return-100903-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100903-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="rXLHOlyz"; 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 44ThbV1WH9z9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:52:53 +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; q=dns; s=default; b=DhUCpSm4cNrcAXNo8Z84bQsDVe7KW7f
	qrAxbZqWdV25BNyqPmbqZRLWiXRLaewjwsE1GXayZMzC2jT/fQrOG/GpHE3m+YIp
	UxR+jPfnZI/pu2z1ugTkZIcGgDBl0kv1/LZHZDEZBxGec9Dj5ghQ1uZTuTUWy3uX
	+SSXRfugjdXk=
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; s=default; bh=tZ8zBtt8+X42jHVNp69ZdUnsOTw=; b=rXLHO
	lyz8NUOVQtZV/IjA50s6thHmfXUISA+k9wr6Zx0KWXfEvP+YKjt/0eMqg25ovWrQ
	qwp3tLVnaLT8VaB9U8s8uxOee3+03EX78jgEXSa8gSXkV6kPK1PG2b6D504nN7XB
	+C/oGy4hnkiqS7iJ8TxZUVuxiPoWwjOEW4Qfv8=
Received: (qmail 16266 invoked by alias); 27 Mar 2019 08:52:37 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 16230 invoked by uid 89); 27 Mar 2019 08:52:36 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-15.8 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=lies,
	H*Ad:D*edu
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 2/7] y2038: Provide conversion helpers for struct __timespec64
Date: Wed, 27 Mar 2019 09:52:05 +0100
Message-Id: <20190327085210.22019-3-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

Those functions allow easy conversion between Y2038 safe struct __timespec64
and other time related data structures.

* 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.
---
 include/time.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/include/time.h b/include/time.h
index d8a3ef35e2..09231073b5 100644
--- a/include/time.h
+++ b/include/time.h
@@ -157,5 +157,90 @@ in_time_t_range (__time64_t t)
   return s == t;
 }
 
+/* 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;
+  /* We only need to zero ts64->tv_pad if we pass it to the kernel.  */
+}
+
+/* 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);
+  /* We only need to zero ts64->tv_pad if we pass it to the kernel.  */
+  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

From patchwork Wed Mar 27 08:52:06 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066742
Return-Path: 
 <libc-alpha-return-100907-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100907-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="inf53guG"; 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 44ThcH05Pqz9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:53:34 +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; q=dns; s=default; b=e7+4J63jkqrLFwddFjvDiSdWWAuSswN
	WXKLASJtnMBPBySEhILQHqLnVNZ+e5vNVHnvEk84dkQhGl7P+5x+r6YdM6xJUNrL
	30VB2oYH7jbuTS5Q5LDqXf9MbeCsxgmrAH4HMpEjoNzIYBp5x6H/jBmdaELx0Tpw
	M0SG0oypT1BU=
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; s=default; bh=lLsq+PSsCrHFDN3WU+u7WXmOoOg=; b=inf53
	guGgghtbpVI9Msd9XMI481we8jSkjF2C+A3Ii4ElRT8UoKtPNt3JPJZWnv0/MmL0
	ZNa4EzgFRzOkHIaxEmzyx7bbNKTNPQSZhrwLvssnrOLM+bI7bbIA7lyDryQB6oj+
	7EDGVf0afk8A1ktGaoYvdFo5gwFn0lbvpOBimM=
Received: (qmail 16815 invoked by alias); 27 Mar 2019 08:52:41 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 16708 invoked by uid 89); 27 Mar 2019 08:52:40 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-18.4 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=__set_errno,
	east
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 3/7] y2038: clock_settime: Provide __clock_settime64
	implementation for linux
Date: Wed, 27 Mar 2019 09:52:06 +0100
Message-Id: <20190327085210.22019-4-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

* include/time.h: Remove __clock_settime typeof
* include/time.h: Add __clock_settime64 definition according to __TIMESIZE
* sysdeps/unix/sysv/linux/clock_settime.c: Remove clock_settime alias
* sysdeps/unix/sysv/linux/clock_settime.c:
  Add clock_settime when __TIMESIZE != 64
  Rewrite __clock_settime() to __clock_settime64 with explicit support for
  64 bit time
---
 include/time.h                          |  9 +++++++-
 sysdeps/unix/sysv/linux/clock_settime.c | 40 +++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/include/time.h b/include/time.h
index 09231073b5..c8c0a6936e 100644
--- a/include/time.h
+++ b/include/time.h
@@ -22,7 +22,6 @@ libc_hidden_proto (strptime)
 extern __typeof (clock_getres) __clock_getres;
 extern __typeof (clock_gettime) __clock_gettime;
 libc_hidden_proto (__clock_gettime)
-extern __typeof (clock_settime) __clock_settime;
 extern __typeof (clock_nanosleep) __clock_nanosleep;
 extern __typeof (clock_getcpuclockid) __clock_getcpuclockid;
 
@@ -103,6 +102,14 @@ extern __time64_t __timegm64 (struct tm *__tp) __THROW;
 libc_hidden_proto (__timegm64)
 #endif
 
+#if __TIMESIZE == 64
+# define __clock_settime64 clock_settime
+#else
+extern int __clock_settime64 (clockid_t clock_id,
+                              const struct __timespec64 *tp);
+libc_hidden_proto (__clock_settime64)
+#endif
+
 /* Compute the `struct tm' representation of T,
    offset OFFSET seconds east of UTC,
    and store year, yday, mon, mday, wday, hour, min, sec into *TP.
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index d837e3019c..5b7ab7fcb3 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -19,19 +19,35 @@
 #include <sysdep.h>
 #include <time.h>
 
-#include "kernel-posix-cpu-timers.h"
+int
+__clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
+{
+	/* Make sure the time cvalue is OK.  */
+	if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
+		{
+			__set_errno (EINVAL);
+			return -1;
+		}
+
+	return INLINE_SYSCALL_CALL (clock_settime, clock_id, tp);
+}
 
-/* Set CLOCK to value TP.  */
+#if __TIMESIZE != 64
 int
-__clock_settime (clockid_t clock_id, const struct timespec *tp)
+clock_settime (clockid_t clock_id, const struct timespec *tp)
 {
-  /* Make sure the time cvalue is OK.  */
-  if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  return INLINE_SYSCALL_CALL (clock_settime, clock_id, tp);
+	struct __timespec64 ts64;
+
+	if (! in_time_t_range (tp->tv_sec))
+		{
+			__set_errno (EOVERFLOW);
+			return -1;
+		}
+
+	valid_timespec_to_timespec64 (tp, &ts64);
+	return __clock_settime64 (clock_id, &ts64);
 }
-weak_alias (__clock_settime, clock_settime)
+
+/* The clock_settime symbol needs to be public as librt is also
+   using it */
+#endif

From patchwork Wed Mar 27 08:52:07 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066741
Return-Path: 
 <libc-alpha-return-100906-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100906-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="e44eEbQq"; 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 44Thc54NgMz9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:53:25 +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; q=dns; s=default; b=XTJ+7h9ersF4PrgBVWuyqQXOrZ5Db/G
	dXdzUkbo6zwGC6rQK8Eu2vHv1ETOJQin+J0l+I1LaB0Jc7CPQnlVFfzAEGv9O4xl
	q9OLGUFHsSqnPLb69i+WT/pe5fXCNKGq7/6hPIu6Z8DByjGDxmZ5rfhZgR8I2zKA
	hNVVadJYds/o=
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; s=default; bh=z7xS8olXBcSs73884N5lK9m/xJc=; b=e44eE
	bQq/06lpPfWufawnRLHJR/tsiqKONvD0MhW6plLy/OIJlVMFj8MPv4UT+KXV2c6p
	njzah2cQSVT0mvm1tx0efjFoBaFBKYBQ9UQb85kf1gUws3NPaziAVOkHGYHj3ed1
	cOog+gec3tNVDnlkiqTF/1lj51cZTZWFC3JpjQ=
Received: (qmail 16767 invoked by alias); 27 Mar 2019 08:52:41 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 16676 invoked by uid 89); 27 Mar 2019 08:52:40 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-17.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=__set_errno,
	H*Ad:D*edu
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 4/7] y2038: rt: clock_settime: Convert __clock_settime to
	__clock_settime64
Date: Wed, 27 Mar 2019 09:52:07 +0100
Message-Id: <20190327085210.22019-5-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

* rt/Versions: Replace __clock_settime with __clock_settime64 in GLIBC_PRIVATE
* rt/clock-compat.c:
  Remove COMPAT_REDIRECT for clock_settime (redirection done in time/time.h)
* rt/clock_settime.c: Rename __clock_settime to __clock_settime64
---
 rt/Versions        | 2 +-
 rt/clock-compat.c  | 3 ---
 rt/clock_settime.c | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/rt/Versions b/rt/Versions
index 91e3fd2a20..d1cf04a56d 100644
--- a/rt/Versions
+++ b/rt/Versions
@@ -5,7 +5,7 @@ libc {
     clock_nanosleep;
   }
   GLIBC_PRIVATE {
-    __clock_getres; __clock_gettime; __clock_settime; __clock_getcpuclockid;
+    __clock_getres; __clock_gettime; __clock_settime64; __clock_getcpuclockid;
     __clock_nanosleep;
   }
 }
diff --git a/rt/clock-compat.c b/rt/clock-compat.c
index d8ced3cdc1..6987a0b6bf 100644
--- a/rt/clock-compat.c
+++ b/rt/clock-compat.c
@@ -48,9 +48,6 @@ COMPAT_REDIRECT (clock_getres,
 COMPAT_REDIRECT (clock_gettime,
 		 (clockid_t clock_id, struct timespec *tp),
 		 (clock_id, tp))
-COMPAT_REDIRECT (clock_settime,
-		 (clockid_t clock_id, const struct timespec *tp),
-		 (clock_id, tp))
 COMPAT_REDIRECT (clock_getcpuclockid,
 		 (pid_t pid, clockid_t *clock_id),
 		 (pid, clock_id))
diff --git a/rt/clock_settime.c b/rt/clock_settime.c
index 891925ab2c..598eb3edc5 100644
--- a/rt/clock_settime.c
+++ b/rt/clock_settime.c
@@ -21,10 +21,10 @@
 
 /* Set CLOCK to value TP.  */
 int
-__clock_settime (clockid_t clock_id, const struct timespec *tp)
+__clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
 {
   __set_errno (ENOSYS);
   return -1;
 }
-weak_alias (__clock_settime, clock_settime)
+weak_alias (__clock_settime64, clock_settime)
 stub_warning (clock_settime)

From patchwork Wed Mar 27 08:52:08 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066743
Return-Path: 
 <libc-alpha-return-100908-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100908-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="QgkIi8SE"; 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 44ThcS2h19z9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:53:44 +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; q=dns; s=default; b=b9lMRt2eoQBTrRsAc15yCQhMw/qicxo
	KU537xxVhEdKkQ3jE4wLXu1PLXh858jXLn5Oh749lC1qiOfq+DF/RJh5iAS1svV8
	kUUZ8erfEcKrsq0JRKKERJ1dkKM4jUlpMzMTM4I/7zAPTlITrnwAz+9tP8TevZRa
	dRJbrN4m+WrI=
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; s=default; bh=TueB9Wu6c7pG25dVCwetGfg8jzE=; b=QgkIi
	8SEYM4cg6HIc2B/gpXtC3tmVMh2ycSFHvA4JRIXA2D4zERa/tdhJNPhF+BFQpYmI
	0KUTHIRdpnccQNnU4UEPIwgHHG5nRUOvqq5BtOMc5TrfdxuiUyjJf7Z4j2gs0pbz
	GcsaiPXhWz4qC20ammhK3NfyupNyY5RX1Zl8uo=
Received: (qmail 17139 invoked by alias); 27 Mar 2019 08:52:43 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 17070 invoked by uid 89); 27 Mar 2019 08:52:42 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-19.0 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=HX-Languages-Length:1698, H*Ad:D*edu
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 5/7] y2038: clock_settime: implementation for Unix generic
Date: Wed, 27 Mar 2019 09:52:08 +0100
Message-Id: <20190327085210.22019-6-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

* sysdeps/unix/clock_settime (hp_timing_settime):
  Use __timespec64 in function prototype
* sysdeps/unix/clock_settime: Rename __clock_settime to __clock_settime64
* sysdeps/unix/clock_settime: Remove weak_alias for __clock_settime
* sysdeps/unix/clock_settime: Add clock_settime when __TIMESIZE != 64
---
 sysdeps/unix/clock_settime.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c
index dcf9ff660a..abaac6e293 100644
--- a/sysdeps/unix/clock_settime.c
+++ b/sysdeps/unix/clock_settime.c
@@ -34,7 +34,7 @@ extern void __pthread_clock_settime (clockid_t clock_id, hp_timing_t offset)
 
 
 static int
-hp_timing_settime (clockid_t clock_id, const struct timespec *tp)
+hp_timing_settime (clockid_t clock_id, const struct __timespec64 *tp)
 {
   hp_timing_t tsc;
   hp_timing_t usertime;
@@ -68,10 +68,9 @@ hp_timing_settime (clockid_t clock_id, const struct timespec *tp)
 }
 #endif
 
-
 /* Set CLOCK to value TP.  */
 int
-__clock_settime (clockid_t clock_id, const struct timespec *tp)
+__clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
 {
   int retval;
 
@@ -108,4 +107,20 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp)
 
   return retval;
 }
-weak_alias (__clock_settime, clock_settime)
+
+#if __TIMESIZE != 64
+int
+clock_settime (clockid_t clock_id, const struct timespec *tp)
+{
+	struct __timespec64 ts64;
+
+	if (! in_time_t_range (tp->tv_sec))
+		{
+			__set_errno (EOVERFLOW);
+			return -1;
+		}
+
+	valid_timespec_to_timespec64 (tp, &ts64);
+	return __clock_settime64 (clock_id, &ts64);
+}
+#endif

From patchwork Wed Mar 27 08:52:09 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066740
Return-Path: 
 <libc-alpha-return-100905-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100905-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="tEhmLn8l"; 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 44Thbt6Hpvz9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:53:14 +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; q=dns; s=default; b=ujNTosUCCMVAlBRdgge1bB+3NQ2ASau
	8hOcAzo0oyggyAqYNifpUMyKkq1WwKuLBfHPLazN5UCzf9FU8mnOsUIOtzhDNfW/
	a0rBVCYgiEvix9qMBVV4TRG5ng4YLe5RqzhwufWuXisEr+I2gUO/ra/CityOmUJt
	SWm5enCN7si0=
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; s=default; bh=kzAea1wf12YkBL5dMzZLqF3OX8w=; b=tEhmL
	n8lqtForb4AWuqjXXe+fZRJltqhzcbR5euMJvEkFwkk7gdXNOZjNTLsvpLYYl6hp
	Z1vnOHuT7Gitw59PdcoGc+iCYhTVMxmcJDoVwr/AepUU+oF8g5vjQryAyJ8O7hp1
	UpttxAR4j2HetRae3juxtCxhjaHXN6tmfWoKV8=
Received: (qmail 16721 invoked by alias); 27 Mar 2019 08:52:41 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 16633 invoked by uid 89); 27 Mar 2019 08:52:40 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-17.2 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=Large, 46
X-HELO: mail-out.m-online.net
From: Lukasz Majewski <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 6/7] y2038: Support for Y2038 safe time on 32 bit systems
	(generic code)
Date: Wed, 27 Mar 2019 09:52:09 +0100
Message-Id: <20190327085210.22019-7-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

* include/features.h:
  Add logic to set __USE_TIME_BITS64 according to passed (when building
  userspace Y2038 safe program on 32 bit system) _TIME_BITS and
  _FILE_OFFSET_BITS
* manual/creature.texi: Add description of _TIME_BITS
* time/bits/types/struct_timespec.h:
  Add "aliasing" (in preprocessor level) for struct timespec to struct
  __timespec64 (in userspace) when running on 32 bit system with Y2038
  support
* time/bits/types/time_t.h:
  Use __time64_t as time_t when __USE_TIME_BITS64 is defined
---
 include/features.h                | 19 +++++++++++++++++++
 manual/creature.texi              | 28 ++++++++++++++++++++++++++++
 time/bits/types/struct_timespec.h |  8 ++++++++
 time/bits/types/time_t.h          |  4 ++++
 4 files changed, 59 insertions(+)

diff --git a/include/features.h b/include/features.h
index e016b3e5c7..bf1d3ccb4f 100644
--- a/include/features.h
+++ b/include/features.h
@@ -365,6 +365,25 @@
 # define __USE_FILE_OFFSET64	1
 #endif
 
+/* we need to know the word size in order to check the time size */
+#include <bits/wordsize.h>
+
+#if defined _TIME_BITS
+# if _TIME_BITS == 64
+#  if ! defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64
+#   error _TIME_BIT==64 is allowed only when _FILE_OFFSET_BITS==64
+#  elif __WORDSIZE == 32
+#   define __USE_TIME_BITS64	1
+#  endif
+# elif __TIME_BITS == 32
+#  if __WORDSIZE > 32
+#   error __TIME_BITS=32 is not compatible with __WORDSIZE > 32
+#  endif
+# else
+#  error Invalid _TIME_BITS value (can only be 32 or 64)
+# endif
+#endif
+
 #if defined _DEFAULT_SOURCE
 # define __USE_MISC	1
 #endif
diff --git a/manual/creature.texi b/manual/creature.texi
index 8876b2ab77..10b7111043 100644
--- a/manual/creature.texi
+++ b/manual/creature.texi
@@ -165,6 +165,34 @@ This macro was introduced as part of the Large File Support extension
 (LFS).
 @end defvr
 
+@defvr Macro _TIME_BITS
+This macro determines the bit size of @code{time_t} (and therefore the
+bit size of all @code{time_t} derived types and the prototypes of all
+related functions). If @code{_TIME_BITS} is undefined, the bit size of
+time_t equals the bit size of the architecture.
+
+If @code{_TIME_BITS} is undefined, or if @code{_TIME_BITS} is defined
+to the value @code{32} and @code{__WORDSIZE} is defined to the value
+@code{32}, or or if @code{_TIME_BITS} is defined to the value @code{64}
+and @code{__WORDSIZE} is defined to the value @code{64}, nothing changes.
+
+If @code{_TIME_BITS} is defined to the value @code{64} and if
+@code{__WORDSIZE} is defined to the value @code{32}, then the @w{64 bit}
+time API and implementation are used even though the architecture word
+size is @code{32}. Also, if the kernel provides @w{64 bit} time support,
+it is used; otherwise, the @w{32 bit} kernel time support is used (with
+no provision to address kernel Y2038 shortcomings).
+
+If @code{_TIME_BITS} is defined to the value @code{32} and if
+@code{__WORDSIZE} is defined to the value @code{64}, then a compile-time
+error is emitted.
+
+If @code{_TIME_BITS} is defined to a value different from both @code{32}
+and @code{64}, then a compile-time error is emitted.
+
+This macro was introduced as part of the Y2038 support.
+@end defvr
+
 @defvr Macro _ISOC99_SOURCE
 @standards{GNU, (none)}
 If this macro is defined, features from ISO C99 are included.  Since
diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
index 5b77c52b4f..fc5a7ec25b 100644
--- a/time/bits/types/struct_timespec.h
+++ b/time/bits/types/struct_timespec.h
@@ -4,6 +4,9 @@
 
 #include <bits/types.h>
 
+/* Use the original definition for 64-bit arches
+   or when 64-bit-time by default has *not* been requested */
+#if __WORDSIZE > 32 || ! defined(__USE_TIME_BITS64)
 /* POSIX.1b structure for a time value.  This is like a `struct timeval' but
    has nanoseconds instead of microseconds.  */
 struct timespec
@@ -11,5 +14,10 @@ struct timespec
   __time_t tv_sec;		/* Seconds.  */
   __syscall_slong_t tv_nsec;	/* Nanoseconds.  */
 };
+#else
+# include <bits/types/struct___timespec64.h>
+/* Use the 64-bit-time timespec by default */
+#define timespec __timespec64
+# endif
 
 #endif
diff --git a/time/bits/types/time_t.h b/time/bits/types/time_t.h
index ab8287c6fe..84d67f6ac3 100644
--- a/time/bits/types/time_t.h
+++ b/time/bits/types/time_t.h
@@ -4,6 +4,10 @@
 #include <bits/types.h>
 
 /* Returned by `time'.  */
+#ifdef __USE_TIME_BITS64
+typedef __time64_t time_t;
+#else
 typedef __time_t time_t;
+#endif
 
 #endif

From patchwork Wed Mar 27 08:52:10 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lukasz Majewski <lukma@denx.de>
X-Patchwork-Id: 1066744
Return-Path: 
 <libc-alpha-return-100909-incoming=patchwork.ozlabs.org@sourceware.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: ozlabs.org;
	spf=pass (mailfrom) smtp.mailfrom=sourceware.org
	(client-ip=209.132.180.131; helo=sourceware.org;
	envelope-from=libc-alpha-return-100909-incoming=patchwork.ozlabs.org@sourceware.org;
	receiver=<UNKNOWN>)
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.b="sK/UYl6Y"; 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 44Thcf4D0Kz9sSh
	for <incoming@patchwork.ozlabs.org>;
	Wed, 27 Mar 2019 19:53:54 +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; q=dns; s=default; b=X9+UdOqUsIjQXu4WQtiqxT5nmjR53Rk
	VVql6cr1Byb770YnINl2fXw+1gdifORo9VsiyaD7rqM1u6PW92KCS/bvzYEcLNEn
	Aod7fCFw2oy7TyoJnHahG0w+hGrjPYEmbAZ+vegi76ydxClWV/ImXEFu9b0ON/WA
	jG+6mzJ58b88=
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; s=default; bh=ft6AjtUpNQBs4RosEOUGVx3SsX8=; b=sK/UY
	l6YHSpNytTs8pz06hmQ7YAsxKYYou7oRp5uNMBZ1W1+9XzAzzr0LX8tFYefSI4H1
	kgxYN+EBm1Fpf0tZSB+i/hA3AAT9JkgIb9wR3BX3ozRU0foAOq+G4QZ3UjDWbKQ/
	yVeBcAeD7JOf+8SGbbpGvdlOzej0wmtIFHnJXg=
Received: (qmail 17222 invoked by alias); 27 Mar 2019 08:52:43 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: 
 <mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 17124 invoked by uid 89); 27 Mar 2019 08:52:43 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-19.5 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 <lukma@denx.de>
To: libc-alpha@sourceware.org,
	Joseph Myers <joseph@codesourcery.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, Zack Weinberg <zackw@panix.com>,
	Lukasz Majewski <lukma@denx.de>
Subject: [RFC 7/7] y2038: Introduce support for clock_settime() being Y2038
	safe
Date: Wed, 27 Mar 2019 09:52:10 +0100
Message-Id: <20190327085210.22019-8-lukma@denx.de>
In-Reply-To: <20190327085210.22019-1-lukma@denx.de>
References: <20190327085210.22019-1-lukma@denx.de>

This patch introduces the Y2038 specific code to make clock_settime()/
__clock_settime64() Y2038 safe on 32 bit systems.

* include/time.h:
  Remove libc_hidden_proto (__clock_settime64) - make the __clock_settime64
  publicly available for Y2038 safe system
* sysdeps/unix/sysv/linux/clock_settime.c:
  Use clock_settime64 kernel syscall (available from 5.1-rc1+ Linux) by
  32 bit Y2038 safe systems
* time/time.h: Redirect clock_settime call to __clock_settime64 on 32 bit
  Y2038 safe systems
---
 include/time.h                          |  4 +++-
 sysdeps/unix/sysv/linux/clock_settime.c | 11 +++++++++++
 time/time.h                             |  9 +++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/include/time.h b/include/time.h
index c8c0a6936e..25ddb70377 100644
--- a/include/time.h
+++ b/include/time.h
@@ -107,7 +107,9 @@ libc_hidden_proto (__timegm64)
 #else
 extern int __clock_settime64 (clockid_t clock_id,
                               const struct __timespec64 *tp);
-libc_hidden_proto (__clock_settime64)
+/* For Y2038 safe system the __clock_settime64 needs to be a visible
+   symbol as a replacement for Y2038 unsafe clock_settime()
+*/
 #endif
 
 /* Compute the `struct tm' representation of T,
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 5b7ab7fcb3..3fcce623c9 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -29,6 +29,17 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
 			return -1;
 		}
 
+/* For being Y2038 safe we check if __TIMESIZE != 64 and run the
+   64 bit syscall only when supported by the kernel.
+   As __clock_settime64() may be also called by 32 bit machine (not Y2038
+   safe) - in case of error - the default kernel syscall (clock_settime)
+   is executed */
+#if defined __NR_clock_settime64 && defined __TIMESIZE != 64
+	int retval = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
+	if (! retval)
+		return retval;
+#endif
+
 	return INLINE_SYSCALL_CALL (clock_settime, clock_id, tp);
 }
 
diff --git a/time/time.h b/time/time.h
index cba6d15260..c9c8aeccfa 100644
--- a/time/time.h
+++ b/time/time.h
@@ -222,6 +222,15 @@ extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp) __THROW;
 extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
      __THROW;
 
+#ifdef __USE_TIME_BITS64
+# if defined(__REDIRECT)
+extern int __REDIRECT (clock_settime, (clockid_t __clock_id, const struct
+     timespec *__tp), __clock_settime64) __THROW;
+# else
+# define clock_settime __clock_settime64
+# endif
+#endif
+
 # ifdef __USE_XOPEN2K
 /* High-resolution sleep with the specified clock.