]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
arm/arm64: KVM: Complete WFI/WFE instructions
authorChristoffer Dall <christoffer.dall@linaro.org>
Tue, 26 Aug 2014 12:33:02 +0000 (14:33 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 30 Apr 2015 09:15:09 +0000 (11:15 +0200)
commitb86185fb902b2f976f1910174a1b9b7b5a958ccb
tree7dffc4e5385387756d410e80a2aff41cb3b73436
parent186a6d9a4eb0ceaac063ee6744840701d03033af
arm/arm64: KVM: Complete WFI/WFE instructions

commit 05e0127f9e362b36aa35f17b1a3d52bca9322a3a upstream.

The architecture specifies that when the processor wakes up from a WFE
or WFI instruction, the instruction is considered complete, however we
currrently return to EL1 (or EL0) at the WFI/WFE instruction itself.

While most guests may not be affected by this because their local
exception handler performs an exception returning setting the event bit
or with an interrupt pending, some guests like UEFI will get wedged due
this little mishap.

Simply skip the instruction when we have completed the emulation.

Cc: <stable@vger.kernel.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/arm/kvm/handle_exit.c
arch/arm64/kvm/handle_exit.c