From patchwork Thu Oct 30 11:15:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39824 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3F1D202FE for ; Thu, 30 Oct 2014 11:18:14 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf3028498eek.5 for ; Thu, 30 Oct 2014 04:18:13 -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=ffC8DHZ+w/it+0KoTbnfUhWwjEUTNBIu3x1rlHWaxnk=; b=Xw+rWnXKr2ZMF0fILqJVr8fzW8toe+gNFhUIQm1AnBmqjStDZRxzdKwKxTDGyKMTV5 2DfWjDc382/ONww3DYM7YnPvgvlv3CtBYU+2GEPU0AvJWzp3L1OeV4Q0QNLEd7hhp77v xda7ArU+MrLod+onZkzyHlRghs1fyNgEFUyXXUtQcUBRyqRWC4CuAEI9+V52LT+mv3O5 4mwnFi/7snwqUHwYQ3lKDZkVb+xcBgU9gdSE61XGGGakj9wa921lNusUn8NNnjYO1Bqw 9lIPUkns+rJFqJ1exXADgp5uxRsiQRr44TwYxds/vZASuMvHiuckjEtVRO2iGbJx+wEX 4aCw== X-Gm-Message-State: ALoCoQkc8MSoBVLI7dOAcngp3BIc01NoY4bJF2q7ZvKsNXrYqh1H/OzEOT4u+ah60KUG3nSXa40P X-Received: by 10.181.27.135 with SMTP id jg7mr2880396wid.5.1414667893821; Thu, 30 Oct 2014 04:18:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.5 with SMTP id ca5ls256690lad.68.gmail; Thu, 30 Oct 2014 04:18:13 -0700 (PDT) X-Received: by 10.153.7.107 with SMTP id db11mr18192953lad.35.1414667893630; Thu, 30 Oct 2014 04:18:13 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id gd7si11504324lbc.83.2014.10.30.04.18.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 04:18:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id gf13so4211768lab.17 for ; Thu, 30 Oct 2014 04:18:13 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr18069744lbb.80.1414667893457; Thu, 30 Oct 2014 04:18:13 -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 c5csp22450lbz; Thu, 30 Oct 2014 04:18:12 -0700 (PDT) X-Received: by 10.70.46.137 with SMTP id v9mr16938023pdm.78.1414667891288; Thu, 30 Oct 2014 04:18:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d7si6405623pds.56.2014.10.30.04.18.10 for ; Thu, 30 Oct 2014 04:18:11 -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 S1759461AbaJ3LRn (ORCPT + 26 others); Thu, 30 Oct 2014 07:17:43 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:45466 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759381AbaJ3LRj (ORCPT ); Thu, 30 Oct 2014 07:17:39 -0400 Received: by mail-pa0-f42.google.com with SMTP id bj1so5293554pad.29 for ; Thu, 30 Oct 2014 04:17:38 -0700 (PDT) X-Received: by 10.70.100.229 with SMTP id fb5mr16679473pdb.126.1414667858887; Thu, 30 Oct 2014 04:17:38 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id i10sm6874826pdr.21.2014.10.30.04.17.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 04:17:38 -0700 (PDT) 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 09/11] time: Convert pvclock_read_wallclock() to use timespec64 Date: Thu, 30 Oct 2014 19:15:43 +0800 Message-Id: <1414667745-7703-10-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 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.215.44 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: , As part of addressing 2038 safety for in-kernel uses, this patch creates no functional change, converts pvclock_read_wallclock() to use timespec64 instead of timespec. Signed-off-by: pang.xunlei Acked-by: David Vrabel --- arch/x86/include/asm/pvclock.h | 2 +- arch/x86/kernel/kvmclock.c | 7 +++++-- arch/x86/kernel/pvclock.c | 9 +++++---- arch/x86/xen/time.c | 7 ++----- 4 files changed, 13 insertions(+), 12 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..8e9bbe9 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -117,17 +117,18 @@ 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; + /* TODO: [2038 safety] wall_clock->sec uses time64_t */ + now.tv_sec = (time64_t)wall_clock->sec; now.tv_nsec = wall_clock->nsec; rmb(); /* fetch time before checking version */ } while ((wall_clock->version & 1) || (version != wall_clock->version)); @@ -138,7 +139,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 4e14439..79053ee 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -171,15 +171,12 @@ static cycle_t xen_clocksource_get_cycles(struct clocksource *cs) 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; + struct pvclock_vcpu_time_info *vcpu_time; vcpu_time = &get_cpu_var(xen_vcpu)->time; - /* TODO: [2038 safety] pvclock_read_wallclock() uses timespec64 */ - pvclock_read_wallclock(wall_clock, vcpu_time, &ts_unsafe); - *ts = timespec_to_timespec64(ts_unsafe); + pvclock_read_wallclock(wall_clock, vcpu_time, ts); put_cpu_var(xen_vcpu); }