iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: Relocate MMIO exit stats counting

Browse Source 
Move the stat.mmio_exits update into x86_emulate_instruction().  This is
both a bug fix, e.g. the current update flows will incorrectly increment
mmio_exits on emulation failure, and a preparatory change to set the
stage for eliminating EMULATE_DONE and company.

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2019-08-27 14:40:27 -07:00 committed by Paolo Bonzini
parent 5845038c11
commit bc8a0aafcb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kvm/mmu.c
View File

@ -5456,8 +5456,6 @@ emulate:
case EMULATE_DONE: case EMULATE_DONE:
return 1; return 1;
case EMULATE_USER_EXIT: case EMULATE_USER_EXIT:
++vcpu->stat.mmio_exits;
/* fall through */
case EMULATE_FAIL: case EMULATE_FAIL:
return 0; return 0;
default: default:

1
arch/x86/kvm/vmx/vmx.c
View File

@ -5201,7 +5201,6 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
err = kvm_emulate_instruction(vcpu, 0); err = kvm_emulate_instruction(vcpu, 0);
if (err == EMULATE_USER_EXIT) { if (err == EMULATE_USER_EXIT) {
++vcpu->stat.mmio_exits;
ret = 0; ret = 0;
goto out; goto out;
} }

2
arch/x86/kvm/x86.c
View File

@ -6703,6 +6703,8 @@ restart:
} }
r = EMULATE_USER_EXIT; r = EMULATE_USER_EXIT;
} else if (vcpu->mmio_needed) { } else if (vcpu->mmio_needed) {
++vcpu->stat.mmio_exits;
if (!vcpu->mmio_is_write) if (!vcpu->mmio_is_write)
writeback = false; writeback = false;
r = EMULATE_USER_EXIT; r = EMULATE_USER_EXIT;