VMX: Return to userspace on invalid state emulation failure
PATCH 1/1 VMX: Return to userspace on invalid state emulation failure
Return to userspace instead of repeatedly trying to emulate instructions that have already failed
Signed-off-by Mohammed Gamal <[email protected]>
--- arch/x86/kvm/vmx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/x86/kvm/vmx.c +4 -1
@@ -3341,6 +3341,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu,if (err !=EMULATE_DONE ) {kvm_report_emulation_failure (vcpu,"emulation failure" ); + kvm_run->exit_reason =KVM_EXIT_INTERNAL_ERROR ; + kvm_run->internal.suberror =KVM_INTERNAL_ERROR_EMULATION ;break ; }
@@ -3612,7 +3614,8 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) vmx->entry_time =ktime_get ();/* Handle invalid guest state instead of entering VMX */ -if (vmx->emulation_required && emulate_invalid_guest_state) { +if (vmx->emulation_required && emulate_invalid_guest_state + && kvm_run->internal.suberror !=KVM_INTERNAL_ERROR_EMULATION ) {handle_invalid_guest_state (vcpu, kvm_run);return ; }
Signature · 1 line
1.6.0.4