From patchwork Mon Jul 16 11:26:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 1200541 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 033EE3FC33 for ; Mon, 16 Jul 2012 11:26:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652Ab2GPL0r (ORCPT ); Mon, 16 Jul 2012 07:26:47 -0400 Received: from www.linutronix.de ([62.245.132.108]:52831 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476Ab2GPL0q (ORCPT ); Mon, 16 Jul 2012 07:26:46 -0400 Received: from localhost ([127.0.0.1]) by Galois.linutronix.de with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1SqjRn-0004jY-Os; Mon, 16 Jul 2012 13:26:39 +0200 Date: Mon, 16 Jul 2012 13:26:38 +0200 (CEST) From: Thomas Gleixner To: "Rafael J. Wysocki" cc: Linus Torvalds , Linux PM list , LKML , John Stultz , Ingo Molnar , Peter Zijlstra , Prarit Bhargava , stable@vger.kernel.org, Andreas Schwab Subject: Re: [Regression][Revert request] Excessive delay or hang during resume from system suspend due to a hrtimer commit In-Reply-To: Message-ID: References: <201207152240.50129.rjw@sisk.pl> <201207161316.28875.rjw@sisk.pl> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Mon, 16 Jul 2012, Thomas Gleixner wrote: > On Mon, 16 Jul 2012, Rafael J. Wysocki wrote: > > > On Monday, July 16, 2012, Thomas Gleixner wrote: > > > On Sun, 15 Jul 2012, Rafael J. Wysocki wrote: > > > > To everyone involved: the fact that this change, which was likely to introduce > > > > regressions from the look of it alone, has been pushed to Linus (an to -stable > > > > at the same time!) so late in the cycle, is seriuosly disappointing. > > > > > > Well, we spent an massive amount of time in testing, reviewing and > > > discussion and it definitely did not break suspend/resume here. > > > > I'm not saying that you didn't consider it thoroughly, but unfortunately you > > did overlook this particular issue, didn't you? > > > > > This was not pushed without a lot of thoughts and in fact what you are > > > seing is another long standing bug in the timekeeping resume code, > > > which was just papered over by the incorrect handling of the clock was > > > set cases in the other parts of the system. > > > > > > Does the following patch fix the problem for you ? > > > > Yes, it does, thanks! > > > > > @John: Should that clear ntp as well or is it enough to set ntp_error > > > to 0 ? > > > > > > /me really goes on vacation now. > > > > So who's going to take care of the patch? :-) > > I'm still packing gear. So i'll push it into timers/urgent. Actually that's a bad idea. John want's to double check vs. the ntp_clear question. So John can send it to linus directly. @John: Should it be: timekeeping_update(true) Now I'm gone for real. Thanks, tglx ----- Subject: timekeeping: Add missing update call in timekeeping_resume() From: Thomas Gleixner Date: Mon, 16 Jul 2012 11:47:31 +0200 (CEST) The leap second rework unearthed another issue of inconsistent data. On timekeeping_resume() the timekeeper data is updated, but nothing calls timekeeping_update(), so now the update code in the timer interrupt sees stale values. This has been the case before those changes, but then the timer interrupt was using stale data as well so this went unnoticed for quite some time. Add the missing update call, so all the data is consistent everywhere. Reported-by: Andreas Schwab Reported-by-and-tested-by: "Rafael J. Wysocki" Cc: Linus Torvalds Cc: Linux PM list Cc: John Stultz Cc: Ingo Molnar Cc: Peter Zijlstra , Cc: Prarit Bhargava Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner --- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: tip/kernel/time/timekeeping.c =================================================================== --- tip.orig/kernel/time/timekeeping.c +++ tip/kernel/time/timekeeping.c @@ -717,6 +717,7 @@ static void timekeeping_resume(void) timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock); timekeeper.ntp_error = 0; timekeeping_suspended = 0; + timekeeping_update(false); write_sequnlock_irqrestore(&timekeeper.lock, flags); touch_softlockup_watchdog();