From: tip-bot for Tiantian Feng <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, fengtiantian@huawei.com,
hpa@zytor.com, tglx@linutronix.de, pbonzini@redhat.com,
qiuxishi@huawei.com, peterz@infradead.org, mingo@kernel.org,
torvalds@linux-foundation.org
Subject: [tip:x86/boot] x86/reboot: Turn off KVM when halting a CPU
Date: Thu, 20 Apr 2017 04:16:49 -0700 [thread overview]
Message-ID: <tip-fba4f472b33aa81ca1836f57d005455261e9126f@git.kernel.org> (raw)
In-Reply-To: <20170419161839.30550-1-pbonzini@redhat.com>
Commit-ID: fba4f472b33aa81ca1836f57d005455261e9126f
Gitweb: http://git.kernel.org/tip/fba4f472b33aa81ca1836f57d005455261e9126f
Author: Tiantian Feng <fengtiantian@huawei.com>
AuthorDate: Wed, 19 Apr 2017 18:18:39 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 20 Apr 2017 10:06:57 +0200
x86/reboot: Turn off KVM when halting a CPU
A CPU in VMX root mode will ignore INIT signals and will fail to bring
up the APs after reboot. Therefore, on a panic we disable VMX on all
CPUs before rebooting or triggering kdump.
Do this when halting the machine as well, in case a firmware-level reboot
does not perform a cold reset for all processors. Without doing this,
rebooting the host may hang.
Signed-off-by: Tiantian Feng <fengtiantian@huawei.com>
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
[ Rewritten commit message. ]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm@vger.kernel.org
Link: http://lkml.kernel.org/r/20170419161839.30550-1-pbonzini@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/smp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index d3c66a1..9d7223c 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -33,6 +33,7 @@
#include <asm/mce.h>
#include <asm/trace/irq_vectors.h>
#include <asm/kexec.h>
+#include <asm/virtext.h>
/*
* Some notes on x86 processor bugs affecting SMP operation:
@@ -162,6 +163,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)
if (raw_smp_processor_id() == atomic_read(&stopping_cpu))
return NMI_HANDLED;
+ cpu_emergency_vmxoff();
stop_this_cpu(NULL);
return NMI_HANDLED;
@@ -174,6 +176,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)
asmlinkage __visible void smp_reboot_interrupt(void)
{
ipi_entering_ack_irq();
+ cpu_emergency_vmxoff();
stop_this_cpu(NULL);
irq_exit();
}
prev parent reply other threads:[~2017-04-20 11:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 16:18 [PATCH v5] x86: call smp vmxoff in smp stop Paolo Bonzini
2017-04-20 10:01 ` David Hildenbrand
2017-04-20 10:13 ` Paolo Bonzini
2017-04-20 11:09 ` David Hildenbrand
2017-04-20 11:16 ` tip-bot for Tiantian Feng [this message]
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=tip-fba4f472b33aa81ca1836f57d005455261e9126f@git.kernel.org \
--to=tipbot@zytor.com \
--cc=fengtiantian@huawei.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=qiuxishi@huawei.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome