From patchwork Mon Oct 27 05:46:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pang.xunlei" X-Patchwork-Id: 39551 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 4A8D824026 for ; Mon, 27 Oct 2014 05:48:27 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf87947eek.5 for ; Sun, 26 Oct 2014 22:48:26 -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=Ka7lEz/SvznAk6VeI4183ROtULgX9YEB0GPSPIF5IGg=; b=fvyI+p4itHVo9OTyCsegvUClKaM023egjwJgOxRKxjhJ7wozFCdI4UrQlJvGCNYdnP +n7A+Uhb19IZCxs/eZIxu77E9K3IF2Q2WirVtrCL/zQu4vgp614BB6hgu95Dl9EgAzkK hMgHYnUsptAMvZ2f/5xYNCVCHUfqyU7GK9HjcDknhSrzrLa1TLWcup9Xysu4eDqvXZ8j xs6YjcXgmtgZzhzp5oYszm6OmDcYR3WF8pv69RYo8nBaietyYR0B+R4/scuycE9RvLxy 7/YORafVYrT9MZ+RLSIinuJ3JLpA6ZOB5Ly8gmZSzhi2I+VJbmaLk/n9wwEUUWKnQkk0 k5aQ== X-Gm-Message-State: ALoCoQlS+QaLOfSsnPsVLM6Ucb96D81X/AREjvCAg8EwxHt1KVw3O9WqnERFSXEuFjaEMr/GzX+c X-Received: by 10.180.36.176 with SMTP id r16mr3485205wij.7.1414388906442; Sun, 26 Oct 2014 22:48:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.225 with SMTP id r1ls624424lal.84.gmail; Sun, 26 Oct 2014 22:48:26 -0700 (PDT) X-Received: by 10.112.148.199 with SMTP id tu7mr21215268lbb.7.1414388906096; Sun, 26 Oct 2014 22:48:26 -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 ue6si15220069lbc.68.2014.10.26.22.48.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:48:25 -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 w7so494314lbi.10 for ; Sun, 26 Oct 2014 22:48:25 -0700 (PDT) X-Received: by 10.152.87.98 with SMTP id w2mr20682290laz.27.1414388905770; Sun, 26 Oct 2014 22:48:25 -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 c5csp235747lbz; Sun, 26 Oct 2014 22:48:24 -0700 (PDT) X-Received: by 10.70.128.203 with SMTP id nq11mr11049160pdb.88.1414388903547; Sun, 26 Oct 2014 22:48:23 -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.22 for ; Sun, 26 Oct 2014 22:48:23 -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 S1752457AbaJ0Frx (ORCPT + 26 others); Mon, 27 Oct 2014 01:47:53 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:40764 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752352AbaJ0Fru (ORCPT ); Mon, 27 Oct 2014 01:47:50 -0400 Received: by mail-pa0-f50.google.com with SMTP id eu11so4765358pac.37 for ; Sun, 26 Oct 2014 22:47:49 -0700 (PDT) X-Received: by 10.68.138.196 with SMTP id qs4mr4402929pbb.39.1414388869639; Sun, 26 Oct 2014 22:47:49 -0700 (PDT) Received: from wangdeqiang.com ([210.21.227.66]) by mx.google.com with ESMTPSA id jq5sm9723922pbc.32.2014.10.26.22.47.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Oct 2014 22:47:49 -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 11/12] time: Convert xen_read_wallclock() to use timespec64 Date: Mon, 27 Oct 2014 13:46:41 +0800 Message-Id: <1414388802-5866-10-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 xen_read_wallclock() to use timespec64 instead of timespec. Signed-off-by: pang.xunlei --- arch/x86/xen/time.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index cf1b591..2ce064a 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -169,20 +169,33 @@ 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 ts32; 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() 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); put_cpu_var(xen_vcpu); } +/* + * TODO: [2038 safety] xen_get_wallclock() should be changed to use + * timespec64 for 2038 safety as soon as possible. + */ 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 +498,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,14 +509,9 @@ 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() should be changed to use - * timespec64 for 2038 safety as soon as possible. - */ + /* Set initial system time with full resolution. */ xen_read_wallclock(&tp); - tp64 = timespec_to_timespec64(tp); - do_settimeofday(&tp64); + do_settimeofday(&tp); setup_force_cpu_cap(X86_FEATURE_TSC);