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
This commit is contained in:
commit
b18f1e2199
|
@ -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)
|
static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
kvm_x86_ops->tlb_flush(vcpu);
|
kvm_set_cr3(vcpu, vcpu->arch.cr3);
|
||||||
set_bit(KVM_REQ_MMU_SYNC, &vcpu->requests);
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -338,6 +338,9 @@ EXPORT_SYMBOL_GPL(kvm_lmsw);
|
||||||
|
|
||||||
void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
|
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) {
|
if (cr4 & CR4_RESERVED_BITS) {
|
||||||
printk(KERN_DEBUG "set_cr4: #GP, reserved bits\n");
|
printk(KERN_DEBUG "set_cr4: #GP, reserved bits\n");
|
||||||
kvm_inject_gp(vcpu, 0);
|
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);
|
kvm_inject_gp(vcpu, 0);
|
||||||
return;
|
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)) {
|
&& !load_pdptrs(vcpu, vcpu->arch.cr3)) {
|
||||||
printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
|
printk(KERN_DEBUG "set_cr4: #GP, pdptrs reserved bits\n");
|
||||||
kvm_inject_gp(vcpu, 0);
|
kvm_inject_gp(vcpu, 0);
|
||||||
|
|
Loading…
Reference in New Issue