Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83bafef1 authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

kvm: nVMX: Update MSR load counts on a VMCS switch 



When L0 establishes (or removes) an MSR entry in the VM-entry or VM-exit
MSR load lists, the change should affect the dormant VMCS as well as the
current VMCS. Moreover, the vmcs02 MSR-load addresses should be
initialized.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent cf3215d9

arch/x86/kvm/vmx.c

+11 −0
Original line number Diff line number Diff line
@@ -9967,6 +9967,15 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	 */

	vmx_set_constant_host_state(vmx);



	/*

	 * Set the MSR load/store lists to match L0's settings.

	 */

	vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);

	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.nr);

	vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));

	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.nr);

	vmcs_write64(VM_ENTRY_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.guest));



	/*

	 * HOST_RSP is normally set correctly in vmx_vcpu_run() just before

	 * entry, but only if the current (host) sp changed from the value
@@ -10799,6 +10808,8 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
	load_vmcs12_host_state(vcpu, vmcs12);



	/* Update any VMCS fields that might have changed while L2 ran */

	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.nr);

	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.nr);

	vmcs_write64(TSC_OFFSET, vcpu->arch.tsc_offset);

	if (vmx->hv_deadline_tsc == -1)

		vmcs_clear_bits(PIN_BASED_VM_EXEC_CONTROL,