Skip to content

Commit

Permalink
KVM: arm/arm64: Handle CPU_PM_ENTER_FAILED
Browse files Browse the repository at this point in the history
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: 67f6919 ("arm64: kvm: allows kvm cpu hotplug")
Cc: <[email protected]> # v4.7+
CC: Lorenzo Pieralisi <[email protected]>
Reviewed-by: Christoffer Dall <[email protected]>
Signed-off-by: James Morse <[email protected]>
Signed-off-by: Christoffer Dall <[email protected]>
  • Loading branch information
James Morse authored and chazy committed Jan 23, 2018
1 parent 0482b50 commit 58d6b15
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions virt/kvm/arm/arm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
cpu_hyp_reset();

return NOTIFY_OK;
case CPU_PM_ENTER_FAILED:
case CPU_PM_EXIT:
if (__this_cpu_read(kvm_arm_hardware_enabled))
/* The hardware was enabled before suspend. */
Expand Down

0 comments on commit 58d6b15

Please sign in to comment.