KVM: MMU: fix hugepage mapping corrupt caused by regression

Commit Message

Xiao Guangrong July 23, 2010, 5:16 a.m. UTC

None

Patch

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index a09e04c..d9a2742 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -374,13 +374,13 @@  static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 	     shadow_walk_next(&it)) {
 		gfn_t direct_gfn;
 
+		validate_direct_spte(vcpu, it.sptep, direct_access);
+
 		drop_large_spte(vcpu, it.sptep);
 
 		if (is_shadow_present_pte(*it.sptep))
 			continue;
 
-		validate_direct_spte(vcpu, it.sptep, direct_access);
-
 		direct_gfn = gw->gfn & ~(KVM_PAGES_PER_HPAGE(it.level) - 1);
 
 		sp = kvm_mmu_get_page(vcpu, direct_gfn, addr, it.level-1,