Skip to content

Commit

Permalink
KVM: VMX: Only reset MMU when necessary
Browse files Browse the repository at this point in the history
Only modifying some bits of CR0/CR4 needs paging mode switch.

Modify EFER.NXE bit would result in reserved bit updates.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Sheng Yang authored and Avi Kivity committed Aug 1, 2010
1 parent 62ad075 commit aad8270
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,10 @@ static bool pdptrs_changed(struct kvm_vcpu *vcpu)

static int __kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
{
unsigned long old_cr0 = kvm_read_cr0(vcpu);
unsigned long update_bits = X86_CR0_PG | X86_CR0_WP |
X86_CR0_CD | X86_CR0_NW;

cr0 |= X86_CR0_ET;

#ifdef CONFIG_X86_64
Expand Down Expand Up @@ -449,7 +453,8 @@ static int __kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)

kvm_x86_ops->set_cr0(vcpu, cr0);

kvm_mmu_reset_context(vcpu);
if ((cr0 ^ old_cr0) & update_bits)
kvm_mmu_reset_context(vcpu);
return 0;
}

Expand Down Expand Up @@ -487,7 +492,8 @@ int __kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

kvm_x86_ops->set_cr4(vcpu, cr4);

kvm_mmu_reset_context(vcpu);
if ((cr4 ^ old_cr4) & pdptr_bits)
kvm_mmu_reset_context(vcpu);

return 0;
}
Expand Down Expand Up @@ -693,6 +699,8 @@ static u32 emulated_msrs[] = {

static int set_efer(struct kvm_vcpu *vcpu, u64 efer)
{
u64 old_efer = vcpu->arch.efer;

if (efer & efer_reserved_bits)
return 1;

Expand Down Expand Up @@ -724,6 +732,10 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer)
vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;
kvm_mmu_reset_context(vcpu);

/* Update reserved bits */
if ((efer ^ old_efer) & EFER_NX)
kvm_mmu_reset_context(vcpu);

return 0;
}

Expand Down

0 comments on commit aad8270

Please sign in to comment.