LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, Avi Kivity <avi@qumranet.com>
Subject: Re: [patch] KVM: do VMXOFF upon reboot
Date: Wed, 17 Jan 2007 11:02:10 +0100	[thread overview]
Message-ID: <20070117100210.GA13080@elte.hu> (raw)
In-Reply-To: <20070117095141.GA11341@elte.hu>


* Ingo Molnar <mingo@elte.hu> wrote:

> So i think we should do the patch below - this makes reboot work even 
> in atomic contexts. [...]

hm, this causes problems if KVM is not active on a VT-capable CPU: even 
on CPUs with VT supported, if a VT context is not actually activated, a 
vmxoff causes an invalid opcode exception. So the updated patch below 
uses a slightly more sophisticated approach to avoid that problem.

	Ingo

-------------------->
Subject: [patch] kvm: do VMXOFF upon reboot
From: Ingo Molnar <mingo@elte.hu>

my laptop's BIOS apparently gets confused if the kernel tries to
reboot without first turning VT context off, which results in a
hung (emergency-)reboot. So make sure this happens, right before
we reboot.

( NOTE: this is a dual-core system, but only the core where the
  BIOS executes seems to be affected - the other core can have an
  active VT context just fine - so we dont have to risk reboot
  robustness by doing a CPU cross-call in the emergency reboot
  handler. )

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/i386/kernel/reboot.c   |   16 ++++++++++++++++
 arch/x86_64/kernel/reboot.c |   15 +++++++++++++++
 2 files changed, 31 insertions(+)

Index: linux/arch/i386/kernel/reboot.c
===================================================================
--- linux.orig/arch/i386/kernel/reboot.c
+++ linux/arch/i386/kernel/reboot.c
@@ -318,6 +318,22 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	unsigned long ecx = cpuid_ecx(1);
+
+	/*
+	 * Disable any possibly active VT context (if VT supported):
+	 */
+	if (test_bit(5, &ecx)) { /* has VT support */
+		asm volatile (
+			"1: .byte 0x0f, 0x01, 0xc4	\n" /* vmxoff */
+			"2:				\n"
+ 			".section __ex_table,\"a\"	\n"
+			"   .align 4			\n"
+			"   .long 	1b,2b		\n"
+			".previous			\n"
+		);
+	}
+
 	if (!reboot_thru_bios) {
 		if (efi_enabled) {
 			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL);
Index: linux/arch/x86_64/kernel/reboot.c
===================================================================
--- linux.orig/arch/x86_64/kernel/reboot.c
+++ linux/arch/x86_64/kernel/reboot.c
@@ -114,8 +114,23 @@ void machine_shutdown(void)
 
 void machine_emergency_restart(void)
 {
+	unsigned long ecx = cpuid_ecx(1);
 	int i;
 
+	/*
+	 * Disable any possibly active VT context (if VT supported):
+	 */
+	if (test_bit(5, &ecx)) { /* has VT support */
+		asm volatile (
+			"1: .byte 0x0f, 0x01, 0xc4	\n" /* vmxoff */
+			"2:				\n"
+ 			".section __ex_table,\"a\"	\n"
+			"   .align 8			\n"
+			"   .quad 	1b,2b		\n"
+			".previous			\n"
+		);
+	}
+
 	/* Tell the BIOS if we want cold or warm reboot */
 	*((unsigned short *)__va(0x472)) = reboot_mode;
        

  reply	other threads:[~2007-01-17 10:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-17  9:13 [patch] fix emergency reboot: call reboot notifier list if possible Ingo Molnar
2007-01-17  9:22 ` Russell King
2007-01-17  9:39   ` Ingo Molnar
2007-01-17 10:03     ` Andrew Morton
2007-01-17 10:25       ` Ingo Molnar
2007-01-23 19:57       ` Pavel Machek
2007-01-24 16:30         ` Randy Dunlap
2007-01-24 17:49           ` linux-os (Dick Johnson)
2007-01-17  9:51 ` [patch] KVM: do VMXOFF upon reboot Ingo Molnar
2007-01-17 10:02   ` Ingo Molnar [this message]
2007-01-21 10:17     ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070117100210.GA13080@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@osdl.org \
    --cc=avi@qumranet.com \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [patch] KVM: do VMXOFF upon reboot' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).