]> www.infradead.org Git - users/jedix/linux-maple.git/commit
KVM: arm/arm64: Handle CPU_PM_ENTER_FAILED
authorJames Morse <james.morse@arm.com>
Mon, 22 Jan 2018 18:19:06 +0000 (18:19 +0000)
committerChristoffer Dall <christoffer.dall@linaro.org>
Tue, 23 Jan 2018 15:47:15 +0000 (16:47 +0100)
commit58d6b15e9da5042a99c9c30ad725792e4569150e
tree5e0a549e3ff64df8755410832d3737a27aac2697
parent0482b50546b12e82346903500af081ed329f915c
KVM: arm/arm64: Handle CPU_PM_ENTER_FAILED

cpu_pm_enter() calls the pm notifier chain with CPU_PM_ENTER, then if
there is a failure: CPU_PM_ENTER_FAILED.

When KVM receives CPU_PM_ENTER it calls cpu_hyp_reset() which will
return us to the hyp-stub. If we subsequently get a CPU_PM_ENTER_FAILED,
KVM does nothing, leaving the CPU running with the hyp-stub, at odds
with kvm_arm_hardware_enabled.

Add CPU_PM_ENTER_FAILED as a fallthrough for CPU_PM_EXIT, this reloads
KVM based on kvm_arm_hardware_enabled. This is safe even if CPU_PM_ENTER
never gets as far as KVM, as cpu_hyp_reinit() calls cpu_hyp_reset()
to make sure the hyp-stub is loaded before reloading KVM.

Fixes: 67f691976662 ("arm64: kvm: allows kvm cpu hotplug")
Cc: <stable@vger.kernel.org> # v4.7+
CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
virt/kvm/arm/arm.c