Commit f5c59b57 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: VMX: read idt_vectoring_info a bit earlier 



trace_kvm_exit prints this value (using vmx_get_exit_info)
so it makes sense to read it before the trace point.

Fixes: dcf068da ("KVM: VMX: Introduce generic fastpath handler")

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210217145718.1217358-2-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1aaca37e

arch/x86/kvm/vmx/vmx.c

+3 −1
Original line number Diff line number Diff line
@@ -6841,13 +6841,15 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) 
	if (unlikely((u16)vmx->exit_reason.basic == EXIT_REASON_MCE_DURING_VMENTRY))

		kvm_machine_check();



	if (likely(!vmx->exit_reason.failed_vmentry))

		vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);



	trace_kvm_exit(vmx->exit_reason.full, vcpu, KVM_ISA_VMX);



	if (unlikely(vmx->exit_reason.failed_vmentry))

		return EXIT_FASTPATH_NONE;



	vmx->loaded_vmcs->launched = 1;

	vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);



	vmx_recover_nmi_blocking(vmx);

	vmx_complete_interrupts(vmx);