Commit 7c93be44 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: VMX: move CR3/PDPTR update to vmx_set_cr3 



GUEST_CR3 is updated via kvm_set_cr3 whenever CR3 is modified from
outside guest context. Similarly pdptrs are updated via load_pdptrs.

Let kvm_set_cr3 perform the update, removing it from the vcpu_run
fast path.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Acked-by: default avatarAcked-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1655e3a3

arch/x86/kvm/vmx.c

+1 −4
Original line number Diff line number Diff line
@@ -1737,6 +1737,7 @@ static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) 
		vmcs_write64(EPT_POINTER, eptp);

		guest_cr3 = is_paging(vcpu) ? vcpu->arch.cr3 :

			vcpu->kvm->arch.ept_identity_map_addr;

		ept_load_pdptrs(vcpu);

	}



	vmx_flush_tlb(vcpu);
@@ -3625,10 +3626,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) 
{

	struct vcpu_vmx *vmx = to_vmx(vcpu);



	if (enable_ept && is_paging(vcpu)) {

		vmcs_writel(GUEST_CR3, vcpu->arch.cr3);

		ept_load_pdptrs(vcpu);

	}

	/* Record the guest's net vcpu time for enforced NMI injections. */

	if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked))

		vmx->entry_time = ktime_get();

arch/x86/kvm/x86.c

+3 −1
Original line number Diff line number Diff line
@@ -4591,8 +4591,10 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 


	mmu_reset_needed |= vcpu->arch.cr4 != sregs->cr4;

	kvm_x86_ops->set_cr4(vcpu, sregs->cr4);

	if (!is_long_mode(vcpu) && is_pae(vcpu))

	if (!is_long_mode(vcpu) && is_pae(vcpu)) {

		load_pdptrs(vcpu, vcpu->arch.cr3);

		mmu_reset_needed = 1;

	}



	if (mmu_reset_needed)

		kvm_mmu_reset_context(vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE