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 08/11] time: Convert xen_read_wallclock() to use timespec64
Date: Thu, 30 Oct 2014 19:15:42 +0800 [thread overview]
Message-ID: <1414667745-7703-9-git-send-email-pang.xunlei@linaro.org> (raw)
In-Reply-To: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org>
As part of addressing 2038 safety for in-kernel uses, this patch
creates no functional change, converts xen_read_wallclock() to
use timespec64 instead of timespec.
Signed-off-by: pang.xunlei <pang.xunlei@linaro.org>
---
arch/x86/xen/time.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 16fce39..4e14439 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -169,20 +169,27 @@ static cycle_t xen_clocksource_get_cycles(struct clocksource *cs)
return xen_clocksource_read();
}
-static void xen_read_wallclock(struct timespec *ts)
+static void xen_read_wallclock(struct timespec64 *ts)
{
+ struct timespec ts_unsafe;
struct shared_info *s = HYPERVISOR_shared_info;
struct pvclock_wall_clock *wall_clock = &(s->wc);
struct pvclock_vcpu_time_info *vcpu_time;
vcpu_time = &get_cpu_var(xen_vcpu)->time;
- pvclock_read_wallclock(wall_clock, vcpu_time, ts);
+ /* TODO: [2038 safety] pvclock_read_wallclock() uses timespec64 */
+ pvclock_read_wallclock(wall_clock, vcpu_time, &ts_unsafe);
+ *ts = timespec_to_timespec64(ts_unsafe);
put_cpu_var(xen_vcpu);
}
+/* TODO: [2038 safety] xen_get_wallclock() uses timespec64 */
static void xen_get_wallclock(struct timespec *now)
{
- xen_read_wallclock(now);
+ struct timespec64 now64;
+
+ xen_read_wallclock(&now64);
+ *now = timespec64_to_timespec(now64);
}
static int xen_set_wallclock(const struct timespec *now)
@@ -485,8 +492,7 @@ static const struct pv_time_ops xen_time_ops __initconst = {
static void __init xen_time_init(void)
{
int cpu = smp_processor_id();
- struct timespec tp;
- struct timespec64 tp64;
+ struct timespec64 tp;
clocksource_register_hz(&xen_clocksource, NSEC_PER_SEC);
@@ -497,13 +503,8 @@ static void __init xen_time_init(void)
xen_clockevent = &xen_vcpuop_clockevent;
}
- /*
- * Set initial system time with full resolution
- * TODO: [2038 safety] xen_read_wallclock() uses timespec64
- */
xen_read_wallclock(&tp);
- tp64 = timespec_to_timespec64(tp);
- do_settimeofday64(&tp64);
+ do_settimeofday64(&tp);
setup_force_cpu_cap(X86_FEATURE_TSC);
--
1.7.9.5
next prev parent reply other threads:[~2014-10-30 11:17 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() " pang.xunlei
2014-10-30 11:15 ` [RFC PATCH v2 01/11] time: Add do_settimeofday64() safe version(using timespec64) pang.xunlei
2014-10-30 13:24 ` 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 ` pang.xunlei [this message]
[not found] ` <54522159.8070204@citrix.com>
2014-10-30 14:58 ` [Xen-devel] [RFC PATCH v2 08/11] time: Convert xen_read_wallclock() " 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-9-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®