lkml.org 
[lkml]   [2014]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH v2 08/11] time: Convert xen_read_wallclock() to use timespec64
Date
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


\
 
 \ /
  Last update: 2014-10-30 12:21    [W:0.287 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site