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

KVM: VMX: Move RESET-only VMWRITE sequences to init_vmcs() 



Move VMWRITE sequences in vmx_vcpu_reset() guarded by !init_event into
init_vmcs() to make it more obvious that they're, uh, initializing the
VMCS.

No meaningful functional change intended (though the order of VMWRITEs
and whatnot is different).

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210713163324.627647-44-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7aa13fc3

arch/x86/kvm/vmx/vmx.c

+13 −15
Original line number Diff line number Diff line
@@ -4397,6 +4397,19 @@ static void init_vmcs(struct vcpu_vmx *vmx) 
		vmcs_write64(GUEST_IA32_RTIT_CTL, 0);

	}



	vmcs_write32(GUEST_SYSENTER_CS, 0);

	vmcs_writel(GUEST_SYSENTER_ESP, 0);

	vmcs_writel(GUEST_SYSENTER_EIP, 0);

	vmcs_write64(GUEST_IA32_DEBUGCTL, 0);



	if (cpu_has_vmx_tpr_shadow()) {

		vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, 0);

		if (cpu_need_tpr_shadow(&vmx->vcpu))

			vmcs_write64(VIRTUAL_APIC_PAGE_ADDR,

				     __pa(vmx->vcpu.arch.apic->regs));

		vmcs_write32(TPR_THRESHOLD, 0);

	}



	vmx_setup_uret_msrs(vmx);

}
@@ -4434,13 +4447,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 
	vmcs_write32(GUEST_LDTR_LIMIT, 0xffff);

	vmcs_write32(GUEST_LDTR_AR_BYTES, 0x00082);



	if (!init_event) {

		vmcs_write32(GUEST_SYSENTER_CS, 0);

		vmcs_writel(GUEST_SYSENTER_ESP, 0);

		vmcs_writel(GUEST_SYSENTER_EIP, 0);

		vmcs_write64(GUEST_IA32_DEBUGCTL, 0);

	}



	vmcs_writel(GUEST_GDTR_BASE, 0);

	vmcs_write32(GUEST_GDTR_LIMIT, 0xffff);
@@ -4455,14 +4461,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 


	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);  /* 22.2.1 */



	if (cpu_has_vmx_tpr_shadow() && !init_event) {

		vmcs_write64(VIRTUAL_APIC_PAGE_ADDR, 0);

		if (cpu_need_tpr_shadow(vcpu))

			vmcs_write64(VIRTUAL_APIC_PAGE_ADDR,

				     __pa(vcpu->arch.apic->regs));

		vmcs_write32(TPR_THRESHOLD, 0);

	}



	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);



	vpid_sync_context(vmx->vpid);