Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be2264b authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: MMU: invalidate and flush on spte small->large page size change 



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: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 67ec6607

arch/x86/kvm/mmu.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1870,6 +1870,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 




			child = page_header(pte & PT64_BASE_ADDR_MASK);

			child = page_header(pte & PT64_BASE_ADDR_MASK);

			mmu_page_remove_parent_pte(child, sptep);

			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)) {

		} else if (pfn != spte_to_pfn(*sptep)) {

			pgprintk("hfn old %lx new %lx\n",

			pgprintk("hfn old %lx new %lx\n",

				 spte_to_pfn(*sptep), pfn);

				 spte_to_pfn(*sptep), pfn);