From patchwork Mon Oct 27 05:46:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39552 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CE8AD24026 for ; Mon, 27 Oct 2014 05:48:28 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf847026lam.8 for ; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=4TOt8dp1j3QdYKOqX1QyDM8e6p79HWJ7b2D9HYgT3Gg=; b=BJ53/mrh5msAbRIQ2yydY/UDWxGdEdOEbyN2hb+mog9awIQhSb9T/szw3YuD/mwTJo F1xcqB+U+IEgf5yvZl+FyiIG1fAkkIze4+wAew6BIERKM1QUYHZgfym5nZChUWUbAWZh woMaLVYPNFRXcd1jjznzpiqX1xHLcvGtw2cbL/M/cau+yuCTWA8OvN5YAw7s5kS4rydL ZdzCZnuFE2ZhtoP1pxhauhSHvxl6q87400pTmRTXtX6ePEJpb0oPjT32JBNHj46TZYrs YbE2uJdEFVhglqJWyvskK3/Wwtl1ee0Q2NpoJzup+0c2BKgG6HLTxmoYfhsmh7PJkLnt vbDw== X-Gm-Message-State: ALoCoQnjSLpNY+fDbWZ6WFeKrqoCqcx37vwjf2+0ZtMI/d8CxUhKPjR8ldMR87FOaSbwZsxnxB8k X-Received: by 10.112.247.74 with SMTP id yc10mr146814lbc.8.1414388907574; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.178 with SMTP id az18ls612926lab.96.gmail; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) X-Received: by 10.152.21.226 with SMTP id y2mr21073332lae.70.1414388907144; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id is3si18278366lac.11.2014.10.26.22.48.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:48:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id w7so483579lbi.24 for ; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr20795465lbw.66.1414388907000; Sun, 26 Oct 2014 22:48:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp235751lbz; Sun, 26 Oct 2014 22:48:26 -0700 (PDT) X-Received: by 10.68.255.195 with SMTP id as3mr22389317pbd.38.1414388904306; Sun, 26 Oct 2014 22:48:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id az17si9603072pdb.198.2014.10.26.22.48.23 for ; Sun, 26 Oct 2014 22:48:24 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752488AbaJ0Fr4 (ORCPT + 26 others); Mon, 27 Oct 2014 01:47:56 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:45449 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752408AbaJ0Fry (ORCPT ); Mon, 27 Oct 2014 01:47:54 -0400 Received: by mail-pd0-f171.google.com with SMTP id r10so4996853pdi.16 for ; Sun, 26 Oct 2014 22:47:53 -0700 (PDT) X-Received: by 10.68.167.99 with SMTP id zn3mr22029491pbb.30.1414388873665; Sun, 26 Oct 2014 22:47:53 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id jq5sm9723922pbc.32.2014.10.26.22.47.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:53 -0700 (PDT) From: "pang.xunlei" To: linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Cc: John Stultz , Thomas Gleixner , Alessandro Zummo , "pang.xunlei" Subject: [PATCH RFC 12/12] time: Convert pvclock_read_wallclock() to use timespec64 Date: Mon, 27 Oct 2014 13:46:42 +0800 Message-Id: <1414388802-5866-11-git-send-email-pang.xunlei@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> References: <1414388802-5866-1-git-send-email-pang.xunlei@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pang.xunlei@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The kernel uses 32-bit signed value(time_t) for seconds since 1970-01-01:00:00:00, so 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 safety for in-kernel uses, this patch creates no functional change in existing users, converts pvclock_read_wallclock() to use timespec64 instead of timespec. Signed-off-by: pang.xunlei --- arch/x86/include/asm/pvclock.h | 2 +- arch/x86/kernel/kvmclock.c | 7 +++++-- arch/x86/kernel/pvclock.c | 8 ++++---- arch/x86/xen/time.c | 10 ++-------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index d6b078e..3323413 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h @@ -11,7 +11,7 @@ void pvclock_set_flags(u8 flags); unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src); void pvclock_read_wallclock(struct pvclock_wall_clock *wall, struct pvclock_vcpu_time_info *vcpu, - struct timespec *ts); + struct timespec64 *ts); void pvclock_resume(void); void pvclock_touch_watchdogs(void); diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index d9156ce..7cd3511 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -46,10 +46,12 @@ static struct pvclock_wall_clock wall_clock; /* * The wallclock is the time of day when we booted. Since then, some time may * have elapsed since the hypervisor wrote the data. So we try to account for - * that with system time + * that with system time. + * TODO: [2038 safety] kvm_get_wallclock() should be fixed to use timespec64. */ static void kvm_get_wallclock(struct timespec *now) { + struct timespec64 now64; struct pvclock_vcpu_time_info *vcpu_time; int low, high; int cpu; @@ -63,7 +65,8 @@ static void kvm_get_wallclock(struct timespec *now) cpu = smp_processor_id(); vcpu_time = &hv_clock[cpu].pvti; - pvclock_read_wallclock(&wall_clock, vcpu_time, now); + pvclock_read_wallclock(&wall_clock, vcpu_time, &now64); + *now = timespec64_to_timespec(now64); preempt_enable(); } diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 2f355d2..ae3ae07 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -117,17 +117,17 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, struct pvclock_vcpu_time_info *vcpu_time, - struct timespec *ts) + struct timespec64 *ts) { u32 version; u64 delta; - struct timespec now; + struct timespec64 now; /* get wallclock at system boot */ do { version = wall_clock->version; rmb(); /* fetch version before time */ - now.tv_sec = wall_clock->sec; + now.tv_sec = (time64_t)wall_clock->sec; /* TODO: [2038 safety] wall_clock->sec uses time64_t */ now.tv_nsec = wall_clock->nsec; rmb(); /* fetch time before checking version */ } while ((wall_clock->version & 1) || (version != wall_clock->version)); @@ -138,7 +138,7 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, now.tv_nsec = do_div(delta, NSEC_PER_SEC); now.tv_sec = delta; - set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); + set_normalized_timespec64(ts, now.tv_sec, now.tv_nsec); } #ifdef CONFIG_X86_64 diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 2ce064a..97dd201 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -171,18 +171,12 @@ static cycle_t xen_clocksource_get_cycles(struct clocksource *cs) static void xen_read_wallclock(struct timespec64 *ts) { - struct timespec ts32; struct shared_info *s = HYPERVISOR_shared_info; struct pvclock_wall_clock *wall_clock = &(s->wc); - struct pvclock_vcpu_time_info *vcpu_time; + struct pvclock_vcpu_time_info *vcpu_time; vcpu_time = &get_cpu_var(xen_vcpu)->time; - /* - * TODO: [2038 safety] pvclock_read_wallclock() should be changed - * to use timespec64 for 2038 safety as soon as possible. - */ - pvclock_read_wallclock(wall_clock, vcpu_time, &ts32); - *ts = timespec_to_timespec64(ts32); + pvclock_read_wallclock(wall_clock, vcpu_time, ts); put_cpu_var(xen_vcpu); }