From patchwork Sun Feb 15 13:09:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xunlei Pang X-Patchwork-Id: 44686 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A45B521533 for ; Sun, 15 Feb 2015 13:12:50 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf12334416wiw.0 for ; Sun, 15 Feb 2015 05:12:50 -0800 (PST) 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=CN+Qurab65yyVv8lMvWIdcJa3LbV4o7VLCSJlfLBQxM=; b=DzlrpH11FpSfMcBAueOg4KHCzmkBmM9Dqv91+3DjZenmnfit3+3S2TYmsZQk8acXVI lAkHCJNppgwy9oK6J3HsUOniNxG39nRmhcv/hawYthw+Gl65U8GIPVcL6tugtX90ChRq +ZmApTYq9AD9LB1iuQY9ZOGCchh8M/fGCbgN8Z9zy0qfQqs+sI3YHduk6rPzi8PJmm6S tYI/MbHUbRtKJX8+n1vQpx+sQZmNzC+3E+Vgz+SO515k7YCCvywLGcZEsgoJsXPQE203 zYALNVwrCv9THsW4h0vZLfTqkZaMOQR03B+HDfBLodeAMIqsUJFqGOWfjJWLU0SSV7Sw BtHQ== X-Gm-Message-State: ALoCoQl6bb5Jgy4te2syuzMALQFF/AYUdJVt7ux0TVl3PSsAp/eqCqdMA61Pi19c2UkJikYzO1XC X-Received: by 10.180.104.101 with SMTP id gd5mr497484wib.6.1424005969983; Sun, 15 Feb 2015 05:12:49 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.229 with SMTP id v5ls444234lav.55.gmail; Sun, 15 Feb 2015 05:12:49 -0800 (PST) X-Received: by 10.112.134.106 with SMTP id pj10mr17624275lbb.58.1424005969653; Sun, 15 Feb 2015 05:12:49 -0800 (PST) Received: from mail-lb0-x230.google.com (mail-lb0-x230.google.com. [2a00:1450:4010:c04::230]) by mx.google.com with ESMTPS id q12si6616615laa.59.2015.02.15.05.12.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Feb 2015 05:12:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::230 as permitted sender) client-ip=2a00:1450:4010:c04::230; Received: by mail-lb0-f176.google.com with SMTP id u10so22900452lbd.7 for ; Sun, 15 Feb 2015 05:12:49 -0800 (PST) X-Received: by 10.112.56.139 with SMTP id a11mr17031229lbq.36.1424005968896; Sun, 15 Feb 2015 05:12:48 -0800 (PST) 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.35.133 with SMTP id h5csp1038694lbj; Sun, 15 Feb 2015 05:12:48 -0800 (PST) X-Received: by 10.66.186.166 with SMTP id fl6mr31072292pac.95.1424005967022; Sun, 15 Feb 2015 05:12:47 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rn9si10732915pbc.203.2015.02.15.05.12.46; Sun, 15 Feb 2015 05:12:47 -0800 (PST) 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 S1755057AbbBONMj (ORCPT + 28 others); Sun, 15 Feb 2015 08:12:39 -0500 Received: from m50-110.126.com ([123.125.50.110]:48894 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754672AbbBONMJ (ORCPT ); Sun, 15 Feb 2015 08:12:09 -0500 Received: from localhost.localdomain (unknown [210.21.223.3]) by smtp4 (Coremail) with SMTP id jdKowABXINyomuBUw_mjCw--.246S3; Sun, 15 Feb 2015 21:10:10 +0800 (CST) From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: rtc-linux@googlegroups.com, Thomas Gleixner , Alessandro Zummo , John Stultz , Arnd Bergmann , Peter Zijlstra , Xunlei Pang Subject: [PATCH v4 2/4] time: Fix a bug in timekeeping_suspend() with no persistent clock Date: Sun, 15 Feb 2015 21:09:43 +0800 Message-Id: <1424005785-17865-2-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424005785-17865-1-git-send-email-xlpang@126.com> References: <1424005785-17865-1-git-send-email-xlpang@126.com> X-CM-TRANSID: jdKowABXINyomuBUw_mjCw--.246S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxXr43Cry7Kw43Aw4DXrW7twb_yoWruF4Up3 y2kr13Ka1DXF1a9rnFk3Zru3sIgws5Kw47A3sIk34xC347Xrs3Gr10k3yrtryq9ryfA3s8 Zr48ta45Ww4UCFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jJqXdUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiJxKhv01sAb9K6QAAsX Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: xlpang@126.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::230 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=126.com 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: , From: Xunlei Pang When there's no persistent clock, normally timekeeping_suspend_time should always be zero, but this can break in timekeeping_suspend(). At T1, there was a system suspend, so old_delta was assigned T1. After some time, one time adjustment happened, and xtime got the value of T1-dt(0s --- kernel/time/timekeeping.c | 50 ++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index d78a528..ec6ee9b 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1100,8 +1100,8 @@ void __init timekeeping_init(void) raw_spin_unlock_irqrestore(&timekeeper_lock, flags); } -/* time in seconds when suspend began */ -static struct timespec64 timekeeping_suspend_time; +/* time in seconds when suspend began for persistent clock */ +static struct timespec64 persistent_clock_suspendtime; /** * __timekeeping_inject_sleeptime - Internal function to add sleep interval @@ -1231,8 +1231,9 @@ static void timekeeping_resume(void) ts_delta = ns_to_timespec64(nsec); suspendtime_found = true; - } else if (timespec64_compare(&ts_new, &timekeeping_suspend_time) > 0) { - ts_delta = timespec64_sub(ts_new, timekeeping_suspend_time); + } else if (timespec64_compare(&ts_new, + &persistent_clock_suspendtime) > 0) { + ts_delta = timespec64_sub(ts_new, persistent_clock_suspendtime); suspendtime_found = true; } @@ -1264,14 +1265,15 @@ static int timekeeping_suspend(void) struct timespec tmp; read_persistent_clock(&tmp); - timekeeping_suspend_time = timespec_to_timespec64(tmp); + persistent_clock_suspendtime = timespec_to_timespec64(tmp); /* * On some systems the persistent_clock can not be detected at * timekeeping_init by its return value, so if we see a valid * value returned, update the persistent_clock_exists flag. */ - if (timekeeping_suspend_time.tv_sec || timekeeping_suspend_time.tv_nsec) + if (persistent_clock_suspendtime.tv_sec || + persistent_clock_suspendtime.tv_nsec) persistent_clock_exist = true; raw_spin_lock_irqsave(&timekeeper_lock, flags); @@ -1279,24 +1281,28 @@ static int timekeeping_suspend(void) timekeeping_forward_now(tk); timekeeping_suspended = 1; - /* - * To avoid drift caused by repeated suspend/resumes, - * which each can add ~1 second drift error, - * try to compensate so the difference in system time - * and persistent_clock time stays close to constant. - */ - delta = timespec64_sub(tk_xtime(tk), timekeeping_suspend_time); - delta_delta = timespec64_sub(delta, old_delta); - if (abs(delta_delta.tv_sec) >= 2) { + if (has_persistent_clock()) { /* - * if delta_delta is too large, assume time correction - * has occured and set old_delta to the current delta. + * To avoid drift caused by repeated suspend/resumes, + * which each can add ~1 second drift error, + * try to compensate so the difference in system time + * and persistent_clock time stays close to constant. */ - old_delta = delta; - } else { - /* Otherwise try to adjust old_system to compensate */ - timekeeping_suspend_time = - timespec64_add(timekeeping_suspend_time, delta_delta); + delta = timespec64_sub(tk_xtime(tk), + persistent_clock_suspendtime); + delta_delta = timespec64_sub(delta, old_delta); + if (abs(delta_delta.tv_sec) >= 2) { + /* + * if delta_delta is too large, assume time correction + * has occurred and set old_delta to the current delta. + */ + old_delta = delta; + } else { + /* Otherwise try to adjust old_system to compensate */ + persistent_clock_suspendtime = + timespec64_add(persistent_clock_suspendtime, + delta_delta); + } } timekeeping_update(tk, TK_MIRROR);