mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "pang.xunlei" <pang.xunlei@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: rtc-linux@googlegroups.com, xen-devel@lists.xenproject.org,
	John Stultz <john.stultz@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Alessandro Zummo <a.zummo@towertech.it>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	"pang.xunlei" <pang.xunlei@linaro.org>
Subject: [RFC PATCH v2 01/11] time: Add do_settimeofday64() safe version(using timespec64)
Date: Thu, 30 Oct 2014 19:15:35 +0800	[thread overview]
Message-ID: <1414667745-7703-2-git-send-email-pang.xunlei@linaro.org> (raw)
In-Reply-To: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org>

The kernel uses 32-bit signed value(time_t) for seconds elapsed
1970-01-01:00:00:00, thus it will overflow at 2038-01-19 03:14:08
on 32-bit systems. We call this "2038 safety" issue.

As part of addressing 2038 saftey for in-kernel uses, this patch
adds safe do_settimeofday64() using timespec64. After this patch,
do_settimeofday() should be replaced by do_settimeofday64() one
by one. Eventually, do_settimeofday() will be removed from the
kernel when it has no users.

Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
---
 include/linux/timekeeping.h |    1 +
 kernel/time/timekeeping.c   |   34 +++++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 1caa6b0..afc61c3 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -10,6 +10,7 @@ extern int timekeeping_suspended;
  * Get and set timeofday
  */
 extern void do_gettimeofday(struct timeval *tv);
+extern int do_settimeofday64(const struct timespec64 *ts);
 extern int do_settimeofday(const struct timespec *tv);
 extern int do_sys_settimeofday(const struct timespec *tv,
 			       const struct timezone *tz);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index ec1791f..f0dcbc0 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -703,18 +703,19 @@ void do_gettimeofday(struct timeval *tv)
 EXPORT_SYMBOL(do_gettimeofday);
 
 /**
- * do_settimeofday - Sets the time of day
- * @tv:		pointer to the timespec variable containing the new time
+ * do_settimeofday64 - Sets the time of day
+ * @ts:     pointer to the timespec64 variable containing the new time
  *
  * Sets the time of day to the new time and update NTP and notify hrtimers
+ * Safe version for 2038 safety.
  */
-int do_settimeofday(const struct timespec *tv)
+int do_settimeofday64(const struct timespec64 *ts)
 {
 	struct timekeeper *tk = &tk_core.timekeeper;
-	struct timespec64 ts_delta, xt, tmp;
+	struct timespec64 ts_delta, xt;
 	unsigned long flags;
 
-	if (!timespec_valid_strict(tv))
+	if (!timespec64_valid_strict(ts))
 		return -EINVAL;
 
 	raw_spin_lock_irqsave(&timekeeper_lock, flags);
@@ -723,13 +724,12 @@ int do_settimeofday(const struct timespec *tv)
 	timekeeping_forward_now(tk);
 
 	xt = tk_xtime(tk);
-	ts_delta.tv_sec = tv->tv_sec - xt.tv_sec;
-	ts_delta.tv_nsec = tv->tv_nsec - xt.tv_nsec;
+	ts_delta.tv_sec = ts->tv_sec - xt.tv_sec;
+	ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec;
 
 	tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, ts_delta));
 
-	tmp = timespec_to_timespec64(*tv);
-	tk_set_xtime(tk, &tmp);
+	tk_set_xtime(tk, ts);
 
 	timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
 
@@ -741,6 +741,22 @@ int do_settimeofday(const struct timespec *tv)
 
 	return 0;
 }
+EXPORT_SYMBOL(do_settimeofday64);
+
+/**
+ * do_settimeofday - Sets the time of day
+ * @tv:		pointer to the timespec variable containing the new time
+ *
+ * Sets the time of day to the new time and update NTP and notify hrtimers
+ * TODO: [2038 safety] should be replaced by do_settimeofday64().
+ */
+int do_settimeofday(const struct timespec *tv)
+{
+	struct timespec64 ts64;
+
+	ts64 = timespec_to_timespec64(*tv);
+	return do_settimeofday64(&ts64);
+}
 EXPORT_SYMBOL(do_settimeofday);
 
 /**
-- 
1.7.9.5


  reply	other threads:[~2014-10-30 11:16 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-30 11:15 [RFC PATCH v2 00/11] Convert do_settimeofday() to use timespec64 pang.xunlei
2014-10-30 11:15 ` pang.xunlei [this message]
2014-10-30 13:24   ` [RFC PATCH v2 01/11] time: Add do_settimeofday64() safe version(using timespec64) Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 02/11] time: Add mktime64() safe version(using time64_t) pang.xunlei
2014-10-30 13:43   ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 03/11] time: Add rtc_tm_to_time64() " pang.xunlei
2014-10-30 13:55   ` Thomas Gleixner
2014-10-30 16:30     ` pang.xunlei
2014-10-30 20:49       ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 04/11] time: Add rtc_time_to_tm64() " pang.xunlei
2014-10-30 14:07   ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 05/11] time: Convert all users of do_settimeofday() to use do_settimeofday64() pang.xunlei
2014-10-30 14:49   ` Thomas Gleixner
2014-10-30 15:27     ` John Stultz
2014-10-30 16:06       ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 06/11] time: Remove do_settimeofday() pang.xunlei
2014-10-30 11:15 ` [RFC PATCH v2 07/11] time: Convert alarm_set_rtc() to use timespec64 pang.xunlei
2014-10-30 14:52   ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 08/11] time: Convert xen_read_wallclock() " pang.xunlei
     [not found]   ` <54522159.8070204@citrix.com>
2014-10-30 14:58     ` [Xen-devel] " Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 09/11] time: Convert pvclock_read_wallclock() " pang.xunlei
2014-10-30 14:57   ` Thomas Gleixner
2014-10-30 11:15 ` [RFC PATCH v2 10/11] time: Convert x86_platform.set_wallclock()to " pang.xunlei
2014-10-30 11:15 ` [RFC PATCH v2 11/11] time: Convert x86_platform.get_wallclock()to " pang.xunlei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414667745-7703-2-git-send-email-pang.xunlei@linaro.org \
    --to=pang.xunlei@linaro.org \
    --cc=a.zummo@towertech.it \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rtc-linux@googlegroups.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tglx@linutronix.de \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®