Commit 4dcefa31 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nVMX: Rename exit_reason to vm_exit_reason for nested VM-Exit 



Use "vm_exit_reason" for code related to injecting a nested VM-Exit to
VM-Exits to make it clear that nested_vmx_vmexit() expects the full exit
eason, not just the basic exit reason.  The basic exit reason (bits 15:0
of vmcs.VM_EXIT_REASON) is colloquially referred to as simply "exit
reason".

Note, other flows, e.g. vmx_handle_exit(), are intentionally left as is.
A future patch will convert vmx->exit_reason to a union + bit-field, and
the exempted flows will interact with the unionized of "exit_reason".

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200415175519.14230-10-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2a783389

arch/x86/kvm/vmx/nested.c

+15 −14
Original line number Diff line number Diff line
@@ -328,19 +328,19 @@ static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu, 
{

	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	u32 exit_reason;

	u32 vm_exit_reason;

	unsigned long exit_qualification = vcpu->arch.exit_qualification;



	if (vmx->nested.pml_full) {

		exit_reason = EXIT_REASON_PML_FULL;

		vm_exit_reason = EXIT_REASON_PML_FULL;

		vmx->nested.pml_full = false;

		exit_qualification &= INTR_INFO_UNBLOCK_NMI;

	} else if (fault->error_code & PFERR_RSVD_MASK)

		exit_reason = EXIT_REASON_EPT_MISCONFIG;

		vm_exit_reason = EXIT_REASON_EPT_MISCONFIG;

	else

		exit_reason = EXIT_REASON_EPT_VIOLATION;

		vm_exit_reason = EXIT_REASON_EPT_VIOLATION;



	nested_vmx_vmexit(vcpu, exit_reason, 0, exit_qualification);

	nested_vmx_vmexit(vcpu, vm_exit_reason, 0, exit_qualification);

	vmcs12->guest_physical_address = fault->address;

}
@@ -4002,11 +4002,11 @@ static void sync_vmcs02_to_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
 * which already writes to vmcs12 directly.

 */

static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,

			   u32 exit_reason, u32 exit_intr_info,

			   u32 vm_exit_reason, u32 exit_intr_info,

			   unsigned long exit_qualification)

{

	/* update exit information fields: */

	vmcs12->vm_exit_reason = exit_reason;

	vmcs12->vm_exit_reason = vm_exit_reason;

	vmcs12->exit_qualification = exit_qualification;

	vmcs12->vm_exit_intr_info = exit_intr_info;
@@ -4318,7 +4318,7 @@ vmabort: 
 * and modify vmcs12 to make it see what it would expect to see there if

 * L2 was its real guest. Must only be called when in L2 (is_guest_mode())

 */

void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,

void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,

		       u32 exit_intr_info, unsigned long exit_qualification)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -4342,9 +4342,9 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
	if (likely(!vmx->fail)) {

		sync_vmcs02_to_vmcs12(vcpu, vmcs12);



		if (exit_reason != -1)

			prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info,

				       exit_qualification);

		if (vm_exit_reason != -1)

			prepare_vmcs12(vcpu, vmcs12, vm_exit_reason,

				       exit_intr_info, exit_qualification);



		/*

		 * Must happen outside of sync_vmcs02_to_vmcs12() as it will
@@ -4399,14 +4399,15 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
		kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);

	}



	if ((exit_reason != -1) && (enable_shadow_vmcs || vmx->nested.hv_evmcs))

	if ((vm_exit_reason != -1) &&

	    (enable_shadow_vmcs || vmx->nested.hv_evmcs))

		vmx->nested.need_vmcs12_to_shadow_sync = true;



	/* in case we halted in L2 */

	vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;



	if (likely(!vmx->fail)) {

		if ((u16)exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT &&

		if ((u16)vm_exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT &&

		    nested_exit_intr_ack_set(vcpu)) {

			int irq = kvm_cpu_get_interrupt(vcpu);

			WARN_ON(irq < 0);
@@ -4414,7 +4415,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
				INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR;

		}



		if (exit_reason != -1)

		if (vm_exit_reason != -1)

			trace_kvm_nested_vmexit_inject(vmcs12->vm_exit_reason,

						       vmcs12->exit_qualification,

						       vmcs12->idt_vectoring_info_field,

arch/x86/kvm/vmx/nested.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ void nested_vmx_free_vcpu(struct kvm_vcpu *vcpu); 
enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,

						     bool from_vmentry);

bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu);

void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,

void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,

		       u32 exit_intr_info, unsigned long exit_qualification);

void nested_sync_vmcs12_to_shadow(struct kvm_vcpu *vcpu);

int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE