This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] Re: 2.6.29 git, resume from ram broken on thinkpad

To: Chris Wright <chrisw@xxxxxxxxxxxx>
Subject: [Xen-devel] Re: 2.6.29 git, resume from ram broken on thinkpad
From: Ingo Molnar <mingo@xxxxxxx>
Date: Fri, 3 Apr 2009 19:39:55 +0200
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx, Arkadiusz Miskiewicz <a.miskiewicz@xxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Mike Travis <travis@xxxxxxx>, "Rafael J. Wysocki" <rjw@xxxxxxx>, virtualization@xxxxxxxxxxxxxx, Yinghai Lu <yhlu.kernel@xxxxxxxxx>, KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>, Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>, Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Delivery-date: Fri, 03 Apr 2009 10:40:38 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20090403173631.GA27148@xxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <200904011155.20751.a.miskiewicz@xxxxxxxxx> <200904030222.57469.a.miskiewicz@xxxxxxxxx> <20090403003523.GK18394@xxxxxxxxxxxxxxxxxxxx> <200904030847.19674.a.miskiewicz@xxxxxxxxx> <20090403173631.GA27148@xxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.18 (2008-05-17)
* Chris Wright <chrisw@xxxxxxxxxxxx> wrote:

> * Arkadiusz Miskiewicz (a.miskiewicz@xxxxxxxxx) wrote:
> > On Friday 03 of April 2009, Chris Wright wrote:
> > > * Arkadiusz Miskiewicz (a.miskiewicz@xxxxxxxxx) wrote:
> > > > What about 9ea09af3bd3090e8349ca2899ca2011bd94cda85 ?
> > > >
> > > > stop_machine: introduce stop_machine_create/destroy.
> > >
> > > That is later fixed in a0e280e0f33f6c859a235fb69a875ed8f3420388.
> > >
> > > Can you please verify if 2.6.29 works for you? 
> > 
> > I think that the guilty part is 
> Indeed, I think you're right.  In fact...this should fix it:

Note that i had to do a manual merge of the patch (it had 3 separate 
patch corruptions) - the non-damaged version i applied is the one 


>From 1f23b77e09be10edb30eb03c1b03879083e3cc72 Mon Sep 17 00:00:00 2001
From: Joseph Cihula <joseph.cihula@xxxxxxxxx>
Date: Mon, 30 Mar 2009 14:03:01 -0700
Subject: [PATCH] x86: disable stack-protector for __restore_processor_state()

The __restore_processor_state() fn restores %gs on resume from S3.  As
such, it cannot be protected by the stack-protector guard since %gs will
not be correct on function entry.

There are only a few other fns in this file and it should not negatively
impact kernel security that they will also have the stack-protector
guard removed (and so it's not worth moving them to another file).

Without this change, S3 resume on a kernel built with

Signed-off-by: Joseph Cihula <joseph.cihula@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
LKML-Reference: <49D13385.5060900@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
 arch/x86/power/Makefile |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index 9ff4d5b..58b32db 100644
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,2 +1,7 @@
+# __restore_processor_state() restores %gs after S3 resume and so should not
+# itself be stack-protected
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_cpu_$(BITS).o   := $(nostackp)
 obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
 obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o

Xen-devel mailing list

<Prev in Thread] Current Thread [Next in Thread>