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

KVM: nVMX: Don't update GUEST_BNDCFGS if it's clean in HV eVMCS 



L1 is responsible for dirtying GUEST_GRP1 if it writes GUEST_BNDCFGS.

Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 699a1ac2

arch/x86/kvm/vmx/nested.c

+4 −4
Original line number Diff line number Diff line
@@ -2197,6 +2197,10 @@ static void prepare_vmcs02_rare(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) 
			vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2);

			vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3);

		}



		if (kvm_mpx_supported() && vmx->nested.nested_run_pending &&

		    (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS))

			vmcs_write64(GUEST_BNDCFGS, vmcs12->guest_bndcfgs);

	}



	if (nested_cpu_has_xsaves(vmcs12))
@@ -2232,10 +2236,6 @@ static void prepare_vmcs02_rare(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) 
	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.guest.nr);



	set_cr4_guest_host_mask(vmx);



	if (kvm_mpx_supported() && vmx->nested.nested_run_pending &&

	    (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS))

		vmcs_write64(GUEST_BNDCFGS, vmcs12->guest_bndcfgs);

}



/*