arm64: KVM: Increment PC after handling an SMC trap
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 6 Feb 2018 17:56:07 +0000 (17:56 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 6 Feb 2018 22:53:52 +0000 (22:53 +0000)
commitf5115e8869e1dfafac0e414b4f1664f3a84a4683
treef0a24b9245dfa58519e61d7de6b15d5d69331f0e
parent20e8175d246e9f9deb377f2784b3e7dfb2ad3e86
arm64: KVM: Increment PC after handling an SMC trap

When handling an SMC trap, the "preferred return address" is set
to that of the SMC, and not the next PC (which is a departure from
the behaviour of an SMC that isn't trapped).

Increment PC in the handler, as the guest is otherwise forever
stuck...

Cc: stable@vger.kernel.org
Fixes: acfb3b883f6d ("arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls")
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kvm/handle_exit.c