From patchwork Wed Nov 30 17:59:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 128548 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8F0F01007D1 for ; Thu, 1 Dec 2011 05:11:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752308Ab1K3SLD (ORCPT ); Wed, 30 Nov 2011 13:11:03 -0500 Received: from acsinet15.oracle.com ([141.146.126.227]:35965 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751279Ab1K3SK7 (ORCPT ); Wed, 30 Nov 2011 13:10:59 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pAUIA9nU007604 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Nov 2011 18:10:10 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id pAUI07o9006066 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Nov 2011 18:00:08 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id pAUI01HA015876; Wed, 30 Nov 2011 12:00:01 -0600 Received: from phenom.dumpdata.com (/209.6.85.33) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Nov 2011 10:00:01 -0800 Received: from phenom.dumpdata.com (localhost.localdomain [127.0.0.1]) by phenom.dumpdata.com (Postfix) with ESMTP id 5B1DE41C2D; Wed, 30 Nov 2011 12:59:39 -0500 (EST) Received: (from konrad@localhost) by phenom.dumpdata.com (8.14.5/8.14.5/Submit) id pAUHxaI3015557; Wed, 30 Nov 2011 12:59:36 -0500 Date: Wed, 30 Nov 2011 12:59:36 -0500 From: Konrad Rzeszutek Wilk To: Borislav Petkov Cc: "Rafael J. Wysocki" , tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, Linux Kernel Mailing List , Linux SCSI List , Linux ACPI , Network Development , Linux Wireless List , DRI , Florian Mickler , Andrew Morton , Kernel Testers List , Linus Torvalds , Linux PM List , Maciej Rutecki , deepthi@linux.vnet.ibm.com Subject: Re: 3.2-rc2+: Reported regressions from 3.0 and 3.1 Message-ID: <20111130175936.GA15168@phenom.dumpdata.com> References: <201111212249.31196.rjw@sisk.pl> <20111122135412.GA29905@phenom.dumpdata.com> <20111129180414.GA11459@phenom.dumpdata.com> <20111129183428.GE8200@aftab> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20111129183428.GE8200@aftab> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090207.4ED67183.0042,ss=1,re=0.000,fgs=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Nov 29, 2011 at 07:34:28PM +0100, Borislav Petkov wrote: > On Tue, Nov 29, 2011 at 01:04:14PM -0500, Konrad Rzeszutek Wilk wrote: > > This patch: Borislav, Thanks for your review comments. How does this patch look? I believe I touched upon all of the things you mentioned. From eb6dbd80078312c428dde69e9313606b7513a2e6 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 21 Nov 2011 18:02:02 -0500 Subject: [PATCH] xen/pm_idle: Make pm_idle be default_idle under Xen. This patch: commit d91ee5863b71e8c90eaf6035bff3078a85e2e7b5 Author: Len Brown Date: Fri Apr 1 18:28:35 2011 -0400 cpuidle: replace xen access to x86 pm_idle and default_idle ..scribble on pm_idle and access default_idle, have it simply disable_cpuidle() so acpi_idle will not load and architecture default HLT will be used. idea was to have one call - disable_cpuidle() which would make pm_idle not be molested by other code. It disallows cpuidle_idle_call to be set to pm_idle (which is excellent). But in the select_idle_routine() and idle_setup(), the pm_idle can still be set to either: amd_e400_idle, mwait_idle or default_idle. This depends on some CPU flags (MWAIT) and in AMD case on the type of CPU. In case of mwait_idle we can hit some instances where the hypervisor (Amazon EC2 specifically) sets the MWAIT and we get: Brought up 2 CPUs invalid opcode: 0000 [#1] SMP CPU 1 Modules linked in: Pid: 0, comm: swapper Not tainted 3.1.0-0.rc6.git0.3.fc16.x86_64 #1 RIP: e030:[] [] mwait_idle+0x6f/0xb4 RSP: e02b:ffff8801d28ddf10 EFLAGS: 00010082 RAX: ffff8801d28dc010 RBX: ffff8801d28ddfd8 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000001 RBP: ffff8801d28ddf10 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000001 R11: ffff8801d28ddfd8 R12: ffffffff81b590d0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8801dff81000(0000) knlGS:0000000000000000 CS: e033 DS: 002b ES: 002b CR0: 000000008005003b CR2: 0000000000000000 CR3: 0000000001a05000 CR4: 0000000000002660 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000000 Process swapper (pid: 0, threadinfo ffff8801d28dc000, task ffff8801d28cae60) Stack: ffff8801d28ddf40 ffffffff8100e2ed ffff8801dff8e390 c136dfe72feab515 0000000000000000 0000000000000000 ffff8801d28ddf50 ffffffff8149ee78 0000000000000000 0000000000000000 0000000000000000 0000000000000000 Call Trace: [] cpu_idle+0xae/0xe8 [] cpu_bringup_and_idle+0xe/0x10 RIP [] mwait_idle+0x6f/0xb4 RSP In case of amd_e400_idle we don't get so spectacular crashes, but we do end up making an MSR which is trapped in the hypervisor, and then follow it up with a yield hypercall. Meaning we end up going to hypervisor twice instead of just once. The previous behavior before v3.0 was that pm_idle was set to default_idle irregardless of select_idle_routine/idle_setup. We want to do that, but only for one specific case: Xen. This patch does that. Fixes RH BZ #739499 and Ubuntu #881076 Reported-by: Stefan Bader Signed-off-by: Konrad Rzeszutek Wilk --- arch/x86/include/asm/system.h | 1 + arch/x86/kernel/process.c | 8 ++++++++ arch/x86/xen/setup.c | 2 +- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h index c2ff2a1..2d2f01c 100644 --- a/arch/x86/include/asm/system.h +++ b/arch/x86/include/asm/system.h @@ -401,6 +401,7 @@ extern unsigned long arch_align_stack(unsigned long sp); extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); +bool set_pm_idle_to_default(void); void stop_this_cpu(void *dummy); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 1f7f8c8..31f47ba 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -404,6 +404,14 @@ void default_idle(void) EXPORT_SYMBOL(default_idle); #endif +bool set_pm_idle_to_default(void) +{ + bool ret = !!pm_idle; + + pm_idle = default_idle; + + return ret; +} void stop_this_cpu(void *dummy) { local_irq_disable(); diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 46d6d21..79dfb57 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -448,6 +448,6 @@ void __init xen_arch_setup(void) #endif disable_cpuidle(); boot_option_idle_override = IDLE_HALT; - + WARN_ON(set_pm_idle_to_default()); fiddle_vdso(); }