]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
KVM: MMU: invalidate and flush on spte small->large page size change
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 28 May 2010 12:44:59 +0000 (09:44 -0300)
committerAvi Kivity <avi@redhat.com>
Sun, 30 May 2010 10:27:30 +0000 (13:27 +0300)
Always invalidate spte and flush TLBs when changing page size, to make
sure different sized translations for the same address are never cached
in a CPU's TLB.

Currently the only case where this occurs is when a non-leaf spte pointer is
overwritten by a leaf, large spte entry. This can happen after dirty
logging is disabled on a memslot, for example.

Noticed by Andrea.

KVM-Stable-Tag
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/mmu.c

index 56f8c3c12c25618ae3c03a3c1319908b3e298d2c..43ec285e877727ef8a8d786048aa1875919ea23a 100644 (file)
@@ -1952,6 +1952,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
 
                        child = page_header(pte & PT64_BASE_ADDR_MASK);
                        mmu_page_remove_parent_pte(child, sptep);
+                       __set_spte(sptep, shadow_trap_nonpresent_pte);
+                       kvm_flush_remote_tlbs(vcpu->kvm);
                } else if (pfn != spte_to_pfn(*sptep)) {
                        pgprintk("hfn old %lx new %lx\n",
                                 spte_to_pfn(*sptep), pfn);