diff options
| author |   James Morse <james.morse@arm.com> | 2017-04-25 18:02:45 +0100 |
|---|---|---|
| committer |   Christoffer Dall <cdall@linaro.org> | 2017-05-16 09:54:25 +0200 |
| commit | e8ec032b182cd4841605de4fc297a8edffe55972 (patch) | |
| tree | a9fdf61ad50bf1de83a24ba083ccd0cf0b650ef5 | |
| parent | KVM: arm: Restore banked registers and physical timer access on hyp_panic() (diff) | |
| download | linux-dev-e8ec032b182cd4841605de4fc297a8edffe55972.tar.xz linux-dev-e8ec032b182cd4841605de4fc297a8edffe55972.zip | |
KVM: arm64: Restore host physical timer access on hyp_panic()
When KVM panics, it hurridly restores the host context and parachutes
into the host's panic() code. At some point panic() touches the physical
timer/counter. Unless we are an arm64 system with VHE, this traps back
to EL2. If we're lucky, we panic again.
Add a __timer_save_state() call to KVMs hyp_panic() path, this saves the
guest registers and disables the traps for the host.
Fixes: 53fd5b6487e4 ("arm64: KVM: Add panic handling")
Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
| -rw-r--r-- | arch/arm64/kvm/hyp/switch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index aede1658aeda..e5f089de6526 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -422,6 +422,7 @@ void __hyp_text __noreturn __hyp_panic(void) vcpu = (struct kvm_vcpu *)read_sysreg(tpidr_el2); host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context); + __timer_save_state(vcpu); __deactivate_traps(vcpu); __deactivate_vm(vcpu); __sysreg_restore_host_state(host_ctxt); |