From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755056AbbBONMj (ORCPT ); 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 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 1.9.1