From patchwork Thu Oct 27 19:20:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 9400251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BEEC460588 for ; Thu, 27 Oct 2016 19:21:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C24D2A366 for ; Thu, 27 Oct 2016 19:21:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90CD12A38A; Thu, 27 Oct 2016 19:21:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 268C82A366 for ; Thu, 27 Oct 2016 19:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941948AbcJ0TV0 (ORCPT ); Thu, 27 Oct 2016 15:21:26 -0400 Received: from mga05.intel.com ([192.55.52.43]:50670 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932442AbcJ0TVZ (ORCPT ); Thu, 27 Oct 2016 15:21:25 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP; 27 Oct 2016 12:20:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,553,1473145200"; d="scan'208";a="778704276" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 27 Oct 2016 12:20:07 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 27 Oct 2016 22:20:06 +0300 Date: Thu, 27 Oct 2016 22:20:06 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Thomas Gleixner Cc: Feng Tang , feng.tang@intel.com, "Rafael J. Wysocki" , "Rafael J. Wysocki" , Steven Rostedt , Sebastian Andrzej Siewior , linux-arch@vger.kernel.org, Rik van Riel , "Srivatsa S. Bhat" , Peter Zijlstra , Arjan van de Ven , Rusty Russell , Oleg Nesterov , Tejun Heo , Andrew Morton , Paul McKenney , Linus Torvalds , Paul Turner , Linux Kernel Mailing List , "Zhang, Rui" , Len Brown , Linux PM , Linux ACPI Subject: Re: S3 resume regression [1cf4f629d9d2 ("cpu/hotplug: Move online calls to hotplugged cpu")] Message-ID: <20161027192006.GF4617@intel.com> References: <573BA5E2.5040506@intel.com> <20160518072424.GU4329@intel.com> <20160526183207.GX4329@intel.com> <20160531072650.GP4329@intel.com> <20160713145425.GB4329@intel.com> <20160809172057.GZ4329@intel.com> <20161027172852.GE4617@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Oct 27, 2016 at 08:48:57PM +0200, Thomas Gleixner wrote: > On Thu, 27 Oct 2016, Ville Syrjälä wrote: > > On Tue, Aug 09, 2016 at 08:20:57PM +0300, Ville Syrjälä wrote: > > > On Thu, Jul 14, 2016 at 04:29:42PM +0800, Feng Tang wrote: > > > > if you only want it to work, you can try an old patch > > > > https://bugzilla.kernel.org/attachment.cgi?id=76071 from a similar bug > > > > https://bugzilla.kernel.org/show_bug.cgi?id=41932 > > > > > > > > Alistair Buxton confirmed it work for 3.18 at least > > > > https://bugzilla.kernel.org/show_bug.cgi?id=107151#c16 > > > > > > That patch is a bit too ripe by now. Would need a fresh squeezed one. > > > > Since no one else bothered to refresh the patch I did it myself: > > > > diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c > > index f6aae7977824..d73d094a8972 100644 > > --- a/kernel/time/tick-broadcast.c > > +++ b/kernel/time/tick-broadcast.c > > @@ -657,8 +657,16 @@ static void tick_handle_oneshot_broadcast(struct clock_event_device *dev) > > * - There are pending events on sleeping CPUs which were not > > * in the event mask > > */ > > - if (next_event.tv64 != KTIME_MAX) > > + if (next_event.tv64 != KTIME_MAX) { > > + s64 delta = next_event.tv64 - now.tv64; > > + > > + if (delta >= 10000000000) { > > + printk(KERN_CRIT "%s(): The delta is big: %lld\n", __func__, delta); > > + next_event.tv64 = now.tv64 + 3000000000; > > + } > > + > > tick_broadcast_set_event(dev, next_cpu, next_event); > > + } > > > > raw_spin_unlock(&tick_broadcast_lock); > > > > Unfortunately it doesn't do anything for me. > > And I'm not surprised, because the original patch forced a 5 seconds event > in the broadcast device on resume, aside of limiting the reprogramming. > > What that old patch did, was: > > 1) Make sure that the broadcast device is actually armed at resume. > > That might cause the HPET to resume proper. > > 2) Force a max. 3 seconds rearm when the targeted expiry time is > than 10 > seconds > > That might make sure that lower C-States are never entered. Doh. I lost the other hunk somewhere. Let's try that again... And indeed with the other hunk in tow the machine would appear to resume properly. > > > The fortunate thing is that acpi-idle has magically been fixed in the > > meantime, so I can at least go back to using that one and have working > > S3. > > What's the lowest C-State with acpi-idle and what's the lowest one with > intel_idle? acpi_idle /sys/devices/system/cpu/cpu0/cpuidle/state3/desc:ACPI FFH INTEL MWAIT 0x30 /sys/devices/system/cpu/cpu0/cpuidle/state3/disable:0 /sys/devices/system/cpu/cpu0/cpuidle/state3/latency:100 /sys/devices/system/cpu/cpu0/cpuidle/state3/name:C3 /sys/devices/system/cpu/cpu0/cpuidle/state3/power:0 /sys/devices/system/cpu/cpu0/cpuidle/state3/residency:200 /sys/devices/system/cpu/cpu0/cpuidle/state3/time:5677316 /sys/devices/system/cpu/cpu0/cpuidle/state3/usage:5920 intel_idle: /sys/devices/system/cpu/cpu0/cpuidle/state3/desc:MWAIT 0x30 /sys/devices/system/cpu/cpu0/cpuidle/state3/disable:0 /sys/devices/system/cpu/cpu0/cpuidle/state3/latency:100 /sys/devices/system/cpu/cpu0/cpuidle/state3/name:C4-ATM /sys/devices/system/cpu/cpu0/cpuidle/state3/power:0 /sys/devices/system/cpu/cpu0/cpuidle/state3/residency:400 /sys/devices/system/cpu/cpu0/cpuidle/state3/time:7146705 /sys/devices/system/cpu/cpu0/cpuidle/state3/usage:6826 diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index f6aae7977824..e2173aeeb00c 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -507,8 +507,12 @@ void tick_resume_broadcast(void) tick_broadcast_start_periodic(bc); break; case TICKDEV_MODE_ONESHOT: - if (!cpumask_empty(tick_broadcast_mask)) + if (!cpumask_empty(tick_broadcast_mask)) { tick_resume_broadcast_oneshot(bc); + clockevents_program_event(bc, + ktime_add_ns(ktime_get(), 5 * NSEC_PER_SEC), + 1); + } break; } } @@ -657,8 +661,16 @@ static void tick_handle_oneshot_broadcast(struct clock_event_device *dev) * - There are pending events on sleeping CPUs which were not * in the event mask */ - if (next_event.tv64 != KTIME_MAX) + if (next_event.tv64 != KTIME_MAX) { + s64 delta = next_event.tv64 - now.tv64; + + if (delta >= 10000000000) { + printk(KERN_CRIT "%s(): The delta is big: %lld\n", __func__, delta); + next_event.tv64 = now.tv64 + 3000000000; + } + tick_broadcast_set_event(dev, next_cpu, next_event); + } raw_spin_unlock(&tick_broadcast_lock);