Commit 8fff2710 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: VMX: Remove EMULATE_FAIL handling in handle_invalid_guest_state()

Now that EMULATE_FAIL is completely unused, remove the last remaning
usage where KVM does something functional in response to EMULATE_FAIL.
Leave the check in place as a WARN_ON_ONCE to provide a better paper
trail when EMULATE_{DONE,FAIL,USER_EXIT} are completely removed.

Opportunistically remove the gotos in handle_invalid_guest_state().
With the EMULATE_FAIL handling gone there is no need to have a common
handler for emulation failure and the gotos only complicate things,
e.g. the signal_pending() check always returns '1', but this is far
from obvious when glancing through the code.
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9497e1f2
...@@ -5169,8 +5169,7 @@ static int handle_nmi_window(struct kvm_vcpu *vcpu) ...@@ -5169,8 +5169,7 @@ static int handle_nmi_window(struct kvm_vcpu *vcpu)
static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
{ {
struct vcpu_vmx *vmx = to_vmx(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu);
enum emulation_result err = EMULATE_DONE; enum emulation_result err;
int ret = 1;
bool intr_window_requested; bool intr_window_requested;
unsigned count = 130; unsigned count = 130;
...@@ -5193,38 +5192,38 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) ...@@ -5193,38 +5192,38 @@ 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)
ret = 0; return 0;
goto out;
}
if (err != EMULATE_DONE) if (WARN_ON_ONCE(err == EMULATE_FAIL))
goto emulation_error; return 1;
if (vmx->emulation_required && !vmx->rmode.vm86_active && if (vmx->emulation_required && !vmx->rmode.vm86_active &&
vcpu->arch.exception.pending) vcpu->arch.exception.pending) {
goto emulation_error; vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
vcpu->run->internal.suberror =
KVM_INTERNAL_ERROR_EMULATION;
vcpu->run->internal.ndata = 0;
return 0;
}
if (vcpu->arch.halt_request) { if (vcpu->arch.halt_request) {
vcpu->arch.halt_request = 0; vcpu->arch.halt_request = 0;
ret = kvm_vcpu_halt(vcpu); return kvm_vcpu_halt(vcpu);
goto out;
} }
/*
* Note, return 1 and not 0, vcpu_run() is responsible for
* morphing the pending signal into the proper return code.
*/
if (signal_pending(current)) if (signal_pending(current))
goto out; return 1;
if (need_resched()) if (need_resched())
schedule(); schedule();
} }
out: return 1;
return ret;
emulation_error:
vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
vcpu->run->internal.ndata = 0;
return 0;
} }
static void grow_ple_window(struct kvm_vcpu *vcpu) static void grow_ple_window(struct kvm_vcpu *vcpu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment