Commit b18f1e21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Fix PDPTR reloading on CR4 writes
  KVM: Make paravirt tlb flush also reload the PAE PDPTRs
parents a0c1af13 a2edf57f

arch/x86/kvm/mmu.c

+1 −2
Original line number Diff line number Diff line
@@ -2897,8 +2897,7 @@ static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu, 


static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu)

{

	kvm_x86_ops->tlb_flush(vcpu);

	set_bit(KVM_REQ_MMU_SYNC, &vcpu->requests);

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

	return 1;

}

arch/x86/kvm/x86.c

+5 −1
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ EXPORT_SYMBOL_GPL(kvm_lmsw); 


void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)

{

	unsigned long old_cr4 = vcpu->arch.cr4;

	unsigned long pdptr_bits = X86_CR4_PGE | X86_CR4_PSE | X86_CR4_PAE;



	if (cr4 & CR4_RESERVED_BITS) {

		printk(KERN_DEBUG "set_cr4: #GP, reserved bits\n");

		kvm_inject_gp(vcpu, 0);
@@ -351,7 +354,8 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
			kvm_inject_gp(vcpu, 0);

			return;

		}

	} else if (is_paging(vcpu) && !is_pae(vcpu) && (cr4 & X86_CR4_PAE)

	} else if (is_paging(vcpu) && (cr4 & X86_CR4_PAE)

		   && ((cr4 ^ old_cr4) & pdptr_bits)

		   && !load_pdptrs(vcpu, vcpu->arch.cr3)) {

		printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");

		kvm_inject_gp(vcpu, 0);