KVM: arm/arm64: Only skip MMIO insn once
authorAndrew Jones <drjones@redhat.com>
Thu, 22 Aug 2019 11:03:05 +0000 (13:03 +0200)
committerMarc Zyngier <maz@kernel.org>
Thu, 22 Aug 2019 12:19:56 +0000 (13:19 +0100)
commit2113c5f62b7423e4a72b890bd479704aa85c81ba
tree348406b3194e49fb49bba929fcaae8f2ba1bca13
parent16e604a437c89751dc626c9e90cf88ba93c5be64
KVM: arm/arm64: Only skip MMIO insn once

If after an MMIO exit to userspace a VCPU is immediately run with an
immediate_exit request, such as when a signal is delivered or an MMIO
emulation completion is needed, then the VCPU completes the MMIO
emulation and immediately returns to userspace. As the exit_reason
does not get changed from KVM_EXIT_MMIO in these cases we have to
be careful not to complete the MMIO emulation again, when the VCPU is
eventually run again, because the emulation does an instruction skip
(and doing too many skips would be a waste of guest code :-) We need
to use additional VCPU state to track if the emulation is complete.
As luck would have it, we already have 'mmio_needed', which even
appears to be used in this way by other architectures already.

Fixes: 0d640732dbeb ("arm64: KVM: Skip MMIO insn after emulation")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
virt/kvm/arm/mmio.c