3 files changed, 15 insertions, 4 deletions

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index d4aab865606c..4f98da9243fc 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -500,11 +500,11 @@ struct kvm_vcpu_arch {
 };
 
 struct kvm_lpage_info {
-        unsigned long rmap_pde;
         int write_count;
 };
 
 struct kvm_arch_memory_slot {
+        unsigned long *rmap_pde[KVM_NR_PAGE_SIZES - 1];
         struct kvm_lpage_info *lpage_info[KVM_NR_PAGE_SIZES - 1];
 };
 
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d2855f895fde..3b3f5ae5da6a 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -960,13 +960,13 @@ static void pte_list_walk(unsigned long *pte_list, pte_list_walk_fn fn)
 static unsigned long *__gfn_to_rmap(gfn_t gfn, int level,
                                     struct kvm_memory_slot *slot)
 {
-        struct kvm_lpage_info *linfo;
+        unsigned long idx;
 
         if (likely(level == PT_PAGE_TABLE_LEVEL))
                 return &slot->rmap[gfn - slot->base_gfn];
 
-        linfo = lpage_info_slot(gfn, slot, level);
-        return &linfo->rmap_pde;
+        idx = gfn_to_index(gfn, slot->base_gfn, level);
+        return &slot->arch.rmap_pde[level - PT_DIRECTORY_LEVEL][idx];
 }
 
 /*
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 59b59508ff07..829b4e972558 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6314,6 +6314,10 @@ void kvm_arch_free_memslot(struct kvm_memory_slot *free,
         int i;
 
         for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) {
+                if (!dont || free->arch.rmap_pde[i] != dont->arch.rmap_pde[i]) {
+                        kvm_kvfree(free->arch.rmap_pde[i]);
+                        free->arch.rmap_pde[i] = NULL;
+                }
                 if (!dont || free->arch.lpage_info[i] != dont->arch.lpage_info[i]) {
                         kvm_kvfree(free->arch.lpage_info[i]);
                         free->arch.lpage_info[i] = NULL;
@@ -6333,6 +6337,11 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
                 lpages = gfn_to_index(slot->base_gfn + npages - 1,
                                       slot->base_gfn, level) + 1;
 
+                slot->arch.rmap_pde[i] =
+                        kvm_kvzalloc(lpages * sizeof(*slot->arch.rmap_pde[i]));
+                if (!slot->arch.rmap_pde[i])
+                        goto out_free;
+
                 slot->arch.lpage_info[i] =
                         kvm_kvzalloc(lpages * sizeof(*slot->arch.lpage_info[i]));
                 if (!slot->arch.lpage_info[i])
@@ -6361,7 +6370,9 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
 
 out_free:
         for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) {
+                kvm_kvfree(slot->arch.rmap_pde[i]);
                 kvm_kvfree(slot->arch.lpage_info[i]);
+                slot->arch.rmap_pde[i] = NULL;
                 slot->arch.lpage_info[i] = NULL;
         }
         return -ENOMEM;