Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759382AbaJ3LRX (ORCPT ); Thu, 30 Oct 2014 07:17:23 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:44786 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759367AbaJ3LRQ (ORCPT ); Thu, 30 Oct 2014 07:17:16 -0400 From: "pang.xunlei" To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, xen-devel@lists.xenproject.org, John Stultz , Thomas Gleixner , Alessandro Zummo , Stefano Stabellini , "pang.xunlei" Subject: [RFC PATCH v2 05/11] time: Convert all users of do_settimeofday() to use do_settimeofday64() Date: Thu, 30 Oct 2014 19:15:39 +0800 Message-Id: <1414667745-7703-6-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org> References: <1414667745-7703-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As part of addressing 2038 saftey for in-kernel uses, this patch converts all users of do_settimeofday() to use do_settimeofday64(). This patch also converts rtc_tm_to_time() to rtc_tm_to_time64(), rtc_time_to_tm() to rtc_time_to_tm64() when needed. Additionally, changes time64_t definition in time64.h to avoid warnings. Signed-off-by: pang.xunlei --- arch/x86/xen/time.c | 9 +++++++-- drivers/hv/hv_util.c | 6 +++--- drivers/rtc/hctosys.c | 10 +++++----- drivers/staging/android/alarm-dev.c | 7 +++++-- include/linux/time64.h | 4 ++-- kernel/compat.c | 5 ++++- kernel/time/time.c | 13 ++++++++++--- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index f473d26..16fce39 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -486,6 +486,7 @@ static void __init xen_time_init(void) { int cpu = smp_processor_id(); struct timespec tp; + struct timespec64 tp64; clocksource_register_hz(&xen_clocksource, NSEC_PER_SEC); @@ -496,9 +497,13 @@ static void __init xen_time_init(void) xen_clockevent = &xen_vcpuop_clockevent; } - /* Set initial system time with full resolution */ + /* + * Set initial system time with full resolution + * TODO: [2038 safety] xen_read_wallclock() uses timespec64 + */ xen_read_wallclock(&tp); - do_settimeofday(&tp); + tp64 = timespec_to_timespec64(tp); + do_settimeofday64(&tp64); setup_force_cpu_cap(X86_FEATURE_TSC); diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index 3b9c9ef..c91167e 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -166,12 +166,12 @@ static void shutdown_onchannelcallback(void *context) static inline void do_adj_guesttime(u64 hosttime) { s64 host_tns; - struct timespec host_ts; + struct timespec64 host_ts; host_tns = (hosttime - WLTIMEDELTA) * 100; - host_ts = ns_to_timespec(host_tns); + host_ts = ns_to_timespec64(host_tns); - do_settimeofday(&host_ts); + do_settimeofday64(&host_ts); } /* diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c index 4aa60d7..239400a 100644 --- a/drivers/rtc/hctosys.c +++ b/drivers/rtc/hctosys.c @@ -26,7 +26,7 @@ static int __init rtc_hctosys(void) { int err = -ENODEV; struct rtc_time tm; - struct timespec tv = { + struct timespec64 tv = { .tv_nsec = NSEC_PER_SEC >> 1, }; struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE); @@ -52,16 +52,16 @@ static int __init rtc_hctosys(void) goto err_invalid; } - rtc_tm_to_time(&tm, &tv.tv_sec); + rtc_tm_to_time64(&tm, &tv.tv_sec); - err = do_settimeofday(&tv); + err = do_settimeofday64(&tv); dev_info(rtc->dev.parent, "setting system clock to " - "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n", + "%d-%02d-%02d %02d:%02d:%02d UTC (%llu)\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, - (unsigned int) tv.tv_sec); + (unsigned long long) tv.tv_sec); err_invalid: err_read: diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c index ff4b3e8..01017ff 100644 --- a/drivers/staging/android/alarm-dev.c +++ b/drivers/staging/android/alarm-dev.c @@ -152,16 +152,19 @@ static int alarm_wait(void) return rv; } +/* TODO: [2038 safety] alarm_set_rtc() uses timespec64 */ static int alarm_set_rtc(struct timespec *ts) { + struct timespec ts64; struct rtc_time new_rtc_tm; struct rtc_device *rtc_dev; unsigned long flags; int rv = 0; - rtc_time_to_tm(ts->tv_sec, &new_rtc_tm); + ts64 = timespec_to_timespec64(*ts); + rtc_time_to_tm64(ts64.tv_sec, &new_rtc_tm); rtc_dev = alarmtimer_get_rtcdev(); - rv = do_settimeofday(ts); + rv = do_settimeofday64(&ts64); if (rv < 0) return rv; if (rtc_dev) diff --git a/include/linux/time64.h b/include/linux/time64.h index a383147..2f0cde4 100644 --- a/include/linux/time64.h +++ b/include/linux/time64.h @@ -3,15 +3,15 @@ #include -typedef __s64 time64_t; - /* * This wants to go into uapi/linux/time.h once we agreed about the * userspace interfaces. */ #if __BITS_PER_LONG == 64 +typedef __kernel_time_t time64_t; # define timespec64 timespec #else +typedef __s64 time64_t; struct timespec64 { time64_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ diff --git a/kernel/compat.c b/kernel/compat.c index ebb3c36..29d3234 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -1047,6 +1047,7 @@ COMPAT_SYSCALL_DEFINE1(time, compat_time_t __user *, tloc) COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) { struct timespec tv; + struct timespec64 tv64; int err; if (get_user(tv.tv_sec, tptr)) @@ -1054,11 +1055,13 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_time_t __user *, tptr) tv.tv_nsec = 0; + /* TODO: [2038 safety] security_settime() uses timespec64 */ err = security_settime(&tv, NULL); if (err) return err; - do_settimeofday(&tv); + tv64 = timespec_to_timespec64(tv); + do_settimeofday64(&tv64); return 0; } diff --git a/kernel/time/time.c b/kernel/time/time.c index f44efdb..5074b9b 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -82,6 +82,7 @@ SYSCALL_DEFINE1(time, time_t __user *, tloc) SYSCALL_DEFINE1(stime, time_t __user *, tptr) { struct timespec tv; + struct timespec64 tv64; int err; if (get_user(tv.tv_sec, tptr)) @@ -93,7 +94,8 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr) if (err) return err; - do_settimeofday(&tv); + tv64 = timespec_to_timespec64(tv); + do_settimeofday64(&tv64); return 0; } @@ -162,6 +164,7 @@ static inline void warp_clock(void) int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz) { + struct timespec64 tv64; static int firsttime = 1; int error = 0; @@ -181,8 +184,12 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz) warp_clock(); } } - if (tv) - return do_settimeofday(tv); + + if (tv) { + tv64 = timespec_to_timespec64(*tv); + return do_settimeofday64(&tv64); + } + return 0; } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/