arm: kvm: fix CPU hotplug
diff mbox

Message ID 1411397568-4738-1-git-send-email-vladimir.murzin@arm.com
State New, archived
Headers show

Commit Message

Vladimir Murzin Sept. 22, 2014, 2:52 p.m. UTC
On some platforms with no power management capabilities, the hotplug
implementation is allowed to return from a smp_ops.cpu_die() call as a
function return. Upon a CPU onlining event, the KVM CPU notifier tries
to reinstall the hyp stub, which fails on platform where no reset took
place following a hotplug event, with the message:

CPU1: smp_ops.cpu_die() returned, trying to resuscitate
CPU1: Booted secondary processor
Kernel panic - not syncing: unexpected prefetch abort in Hyp mode at: 0x80409540
unexpected data abort in Hyp mode at: 0x80401fe8
unexpected HVC/SVC trap in Hyp mode at: 0x805c6170

since KVM code is trying to reinstall the stub on a system where it is
already configured.

To prevent this issue, this patch adds a check in the KVM hotplug
notifier that detects if the HYP stub really needs re-installing when a
CPU is onlined and skips the installation call if the stub is already in
place, which means that the CPU has not been reset.

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/kvm/arm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Christoffer Dall Sept. 29, 2014, 2:03 p.m. UTC | #1
On Mon, Sep 22, 2014 at 03:52:48PM +0100, Vladimir Murzin wrote:
> On some platforms with no power management capabilities, the hotplug
> implementation is allowed to return from a smp_ops.cpu_die() call as a
> function return. Upon a CPU onlining event, the KVM CPU notifier tries
> to reinstall the hyp stub, which fails on platform where no reset took
> place following a hotplug event, with the message:
> 
> CPU1: smp_ops.cpu_die() returned, trying to resuscitate
> CPU1: Booted secondary processor
> Kernel panic - not syncing: unexpected prefetch abort in Hyp mode at: 0x80409540
> unexpected data abort in Hyp mode at: 0x80401fe8
> unexpected HVC/SVC trap in Hyp mode at: 0x805c6170
> 
> since KVM code is trying to reinstall the stub on a system where it is
> already configured.
> 
> To prevent this issue, this patch adds a check in the KVM hotplug
> notifier that detects if the HYP stub really needs re-installing when a
> CPU is onlined and skips the installation call if the stub is already in
> place, which means that the CPU has not been reset.
> 
> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Acked-by: Marc Zyngier <marc.zyngier@arm.com>

Applied to queue, thanks

-Christoffer

Patch
diff mbox

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index a99e0cd..9b43f54 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -826,7 +826,8 @@  static int hyp_init_cpu_notify(struct notifier_block *self,
 	switch (action) {
 	case CPU_STARTING:
 	case CPU_STARTING_FROZEN:
-		cpu_init_hyp_mode(NULL);
+		if (__hyp_get_vectors() == hyp_default_vectors)
+			cpu_init_hyp_mode(NULL);
 		break;
 	}