KVM: MMU: cleanup __direct_map

Use link_shadow_page to link the sp to the spte in __direct_map

Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index e956e9bed29492de89fc8f312307ec7a5a28bfc8..1cda1f33265452b62a5c27e3a367877bf974b437 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1947,9 +1947,9 @@ static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp)
 {
        u64 spte;
 
-       spte = __pa(sp->spt)
-               | PT_PRESENT_MASK | PT_ACCESSED_MASK
-               | PT_WRITABLE_MASK | PT_USER_MASK;
+       spte = __pa(sp->spt) | PT_PRESENT_MASK | PT_WRITABLE_MASK |
+              shadow_user_mask | shadow_x_mask | shadow_accessed_mask;
+
        mmu_spte_set(sptep, spte);
 }
 
@@ -2592,11 +2592,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
                                              iterator.level - 1,
                                              1, ACC_ALL, iterator.sptep);
 
-                       mmu_spte_set(iterator.sptep,
-                                    __pa(sp->spt)
-                                    | PT_PRESENT_MASK | PT_WRITABLE_MASK
-                                    | shadow_user_mask | shadow_x_mask
-                                    | shadow_accessed_mask);
+                       link_shadow_page(iterator.sptep, sp);
                }
        }
        return emulate;