arm64: KVM: Only skip MMIO insn once
PATCH v2 1/1 arm64: KVM: 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.
---
v2: move mmio_needed use closer to other mmio state use [maz]
virt/kvm/arm/mmio.c | 7 +++++++ 1 file changed, 7 insertions(+)
virt/kvm/arm/mmio.c +7 -0
@@ -86,6 +86,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)unsigned int len;int mask; +/* Detect an already handled MMIO return */ +if (unlikely (!vcpu->mmio_needed)) +return 0 ; + + vcpu->mmio_needed =0 ; +if (!run->mmio.is_write) { len = run->mmio.len;if (len >sizeof (unsigned long ))
@@ -188,6 +194,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, run->mmio.is_write = is_write; run->mmio.phys_addr = fault_ipa; run->mmio.len = len; + vcpu->mmio_needed =1 ;if (!ret) {/* We handled the access successfully in the kernel. */
Signature · 1 line
2.18.1
Quoted 12 lines · Andrew Jones
If after an MMIO exit to userspace a VCPU is immediately run with an
immediate_exitrequest, 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 theexit_reasondoes not get changed fromKVM_EXIT_MMIOin 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.
Quoted 2 lines
Fixes 0d640732dbeb ("arm64: KVM: Skip MMIO insn after emulation")Signed-off-by Andrew Jones <[email protected]>
Ouch; sorry about this!
I haven't dug too deeply, but from the commit message, the below makes sense to me. FWIW:
Mark.
Quoted 34 lines
---
v2: movemmio_neededuse closer to other mmio state use [maz]virt/kvm/arm/mmio.c | 7 +++++++ 1 file changed, 7 insertions(+)virt/kvm/arm/mmio.c +7
-0@@ -86,6 +86,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)unsigned int len;int mask; +/* Detect an already handled MMIO return */ +if (unlikely (!vcpu->mmio_needed)) +return 0 ; + + vcpu->mmio_needed =0 ; +if (!run->mmio.is_write) { len = run->mmio.len;if (len >sizeof (unsigned long ))@@ -188,6 +194,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run, run->mmio.is_write = is_write; run->mmio.phys_addr = fault_ipa; run->mmio.len = len; + vcpu->mmio_needed =1 ;if (!ret) {/* We handled the access successfully in the kernel. */ Signature · 1 line
2.18.1
Marc Zyngier
maintainerQuoted 12 lines · Andrew Jones
If after an MMIO exit to userspace a VCPU is immediately run with an
immediate_exitrequest, 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 theexit_reasondoes not get changed fromKVM_EXIT_MMIOin 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.
Quoted 7 lines
Fixes 0d640732dbeb ("arm64: KVM: Skip MMIO insn after emulation")Signed-off-by Andrew Jones <[email protected]>---
v2: movemmio_neededuse closer to other mmio state use [maz]virt/kvm/arm/mmio.c | 7 +++++++ 1 file changed, 7 insertions(+)
Applied with Mark's Ack.
Thanks,
M.
Signature · 1 line
Jazz is not dead, it just smells funny...