[2/4] KVM: MMU: cleanup spte update path

Commit Message

Xiao Guangrong July 13, 2010, 9:43 a.m. UTC

None

Patch

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 9fc1524..67dbafa 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -303,6 +303,22 @@  static u64 __xchg_spte(u64 *sptep, u64 new_spte)
 #endif
 }
 
+static void set_spte_atomic(u64 *sptep, u64 new_spte)
+{
+	pfn_t pfn;
+	u64 old_spte;
+
+	old_spte = __xchg_spte(sptep, new_spte);
+	if (!is_rmap_spte(old_spte))
+		return;
+
+	pfn = spte_to_pfn(old_spte);
+	if (old_spte & shadow_accessed_mask)
+		kvm_set_pfn_accessed(pfn);
+	if (is_writable_pte(old_spte))
+		kvm_set_pfn_dirty(pfn);
+}
+
 static void update_spte(u64 *sptep, u64 new_spte)
 {
 	u64 old_spte;
@@ -680,17 +696,7 @@  static void rmap_remove(struct kvm *kvm, u64 *spte)
 
 static void drop_spte(struct kvm *kvm, u64 *sptep, u64 new_spte)
 {
-	pfn_t pfn;
-	u64 old_spte;
-
-	old_spte = __xchg_spte(sptep, new_spte);
-	if (!is_rmap_spte(old_spte))
-		return;
-	pfn = spte_to_pfn(old_spte);
-	if (old_spte & shadow_accessed_mask)
-		kvm_set_pfn_accessed(pfn);
-	if (is_writable_pte(old_spte))
-		kvm_set_pfn_dirty(pfn);
+	set_spte_atomic(sptep, new_spte);
 	rmap_remove(kvm, sptep);
 }
 
@@ -790,7 +796,7 @@  static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
 			     unsigned long data)
 {
 	int need_flush = 0;
-	u64 *spte, new_spte, old_spte;
+	u64 *spte, new_spte;
 	pte_t *ptep = (pte_t *)data;
 	pfn_t new_pfn;
 
@@ -811,12 +817,7 @@  static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp,
 			new_spte &= ~PT_WRITABLE_MASK;
 			new_spte &= ~SPTE_HOST_WRITEABLE;
 			new_spte &= ~shadow_accessed_mask;
-			if (is_writable_pte(*spte))
-				kvm_set_pfn_dirty(spte_to_pfn(*spte));
-			old_spte = __xchg_spte(spte, new_spte);
-			if (is_shadow_present_pte(old_spte)
-			    && (old_spte & shadow_accessed_mask))
-				mark_page_accessed(pfn_to_page(spte_to_pfn(old_spte)));
+			set_spte_atomic(spte, new_spte);
 			spte = rmap_next(kvm, rmapp, spte);
 		}
 	}