8 files changed, 31 insertions, 14 deletions

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 1d5accbd3dcf..6f0f8f3ac7df 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1155,7 +1155,8 @@ static void stage2_wp_range(struct kvm *kvm, phys_addr_t addr, phys_addr_t end)
  */
 void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot)
 {
-        struct kvm_memory_slot *memslot = id_to_memslot(kvm->memslots, slot);
+        struct kvm_memslots *slots = kvm_memslots(kvm);
+        struct kvm_memory_slot *memslot = id_to_memslot(slots, slot);
         phys_addr_t start = memslot->base_gfn << PAGE_SHIFT;
         phys_addr_t end = (memslot->base_gfn + memslot->npages) << PAGE_SHIFT;
 
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index a8e660a44474..bc5ddd973b44 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -968,6 +968,7 @@ out:
 /* Get (and clear) the dirty memory log for a memory slot. */
 int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         unsigned long ga, ga_end;
         int is_dirty = 0;
@@ -982,7 +983,8 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
 
         /* If nothing is dirty, don't bother messing with page tables. */
         if (is_dirty) {
-                memslot = id_to_memslot(kvm->memslots, log->slot);
+                slots = kvm_memslots(kvm);
+                memslot = id_to_memslot(slots, log->slot);
 
                 ga = memslot->base_gfn << PAGE_SHIFT;
                 ga_end = ga + (memslot->npages << PAGE_SHIFT);
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 1a4acf8bf4f4..dab68b7af3f2 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -650,7 +650,7 @@ static void kvmppc_rmap_reset(struct kvm *kvm)
         int srcu_idx;
 
         srcu_idx = srcu_read_lock(&kvm->srcu);
-        slots = kvm->memslots;
+        slots = kvm_memslots(kvm);
         kvm_for_each_memslot(memslot, slots) {
                 /*
                  * This assumes it is acceptable to lose reference and
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index df81caab7383..6aff5a990492 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -2321,6 +2321,7 @@ static int kvm_vm_ioctl_get_smmu_info_hv(struct kvm *kvm,
 static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm,
                                          struct kvm_dirty_log *log)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         int r;
         unsigned long n;
@@ -2331,7 +2332,8 @@ static int kvm_vm_ioctl_get_dirty_log_hv(struct kvm *kvm,
         if (log->slot >= KVM_USER_MEM_SLOTS)
                 goto out;
 
-        memslot = id_to_memslot(kvm->memslots, log->slot);
+        slots = kvm_memslots(kvm);
+        memslot = id_to_memslot(slots, log->slot);
         r = -ENOENT;
         if (!memslot->dirty_bitmap)
                 goto out;
@@ -2384,6 +2386,7 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,
                                 const struct kvm_memory_slot *old)
 {
         unsigned long npages = mem->memory_size >> PAGE_SHIFT;
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
 
         if (npages && old->npages) {
@@ -2393,7 +2396,8 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,
                  * since the rmap array starts out as all zeroes,
                  * i.e. no pages are dirty.
                  */
-                memslot = id_to_memslot(kvm->memslots, mem->slot);
+                slots = kvm_memslots(kvm);
+                memslot = id_to_memslot(slots, mem->slot);
                 kvmppc_hv_get_dirty_log(kvm, memslot, NULL);
         }
 }
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index f57383941d03..c01dfc798c66 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1530,6 +1530,7 @@ out:
 static int kvm_vm_ioctl_get_dirty_log_pr(struct kvm *kvm,
                                          struct kvm_dirty_log *log)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         struct kvm_vcpu *vcpu;
         ulong ga, ga_end;
@@ -1545,7 +1546,8 @@ static int kvm_vm_ioctl_get_dirty_log_pr(struct kvm *kvm,
 
         /* If nothing is dirty, don't bother messing with page tables. */
         if (is_dirty) {
-                memslot = id_to_memslot(kvm->memslots, log->slot);
+                slots = kvm_memslots(kvm);
+                memslot = id_to_memslot(slots, log->slot);
 
                 ga = memslot->base_gfn << PAGE_SHIFT;
                 ga_end = ga + (memslot->npages << PAGE_SHIFT);
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index d461f8a15c07..a05107e9b2bf 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -236,6 +236,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
 {
         int r;
         unsigned long n;
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         int is_dirty = 0;
 
@@ -245,7 +246,8 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         if (log->slot >= KVM_USER_MEM_SLOTS)
                 goto out;
 
-        memslot = id_to_memslot(kvm->memslots, log->slot);
+        slots = kvm_memslots(kvm);
+        memslot = id_to_memslot(slots, log->slot);
         r = -ENOENT;
         if (!memslot->dirty_bitmap)
                 goto out;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d42d8ace90f1..8918e23e0e8e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7782,6 +7782,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                                 const struct kvm_memory_slot *old,
                                 enum kvm_mr_change change)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *new;
         int nr_mmu_pages = 0;
 
@@ -7803,7 +7804,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
                 kvm_mmu_change_mmu_pages(kvm, nr_mmu_pages);
 
         /* It's OK to get 'new' slot here as it has already been installed */
-        new = id_to_memslot(kvm->memslots, mem->slot);
+        slots = kvm_memslots(kvm);
+        new = id_to_memslot(slots, mem->slot);
 
         /*
          * Dirty logging tracks sptes in 4k granularity, meaning that large
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e299763ef744..42df724071c0 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -734,7 +734,7 @@ static int check_memory_region_flags(struct kvm_userspace_memory_region *mem)
 static struct kvm_memslots *install_new_memslots(struct kvm *kvm,
                 struct kvm_memslots *slots)
 {
-        struct kvm_memslots *old_memslots = kvm->memslots;
+        struct kvm_memslots *old_memslots = kvm_memslots(kvm);
 
         /*
          * Set the low bit in the generation, which disables SPTE caching
@@ -799,7 +799,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
         if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr)
                 goto out;
 
-        slot = id_to_memslot(kvm->memslots, mem->slot);
+        slot = id_to_memslot(kvm_memslots(kvm), mem->slot);
         base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
         npages = mem->memory_size >> PAGE_SHIFT;
 
@@ -842,7 +842,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
         if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) {
                 /* Check for overlaps */
                 r = -EEXIST;
-                kvm_for_each_memslot(slot, kvm->memslots) {
+                kvm_for_each_memslot(slot, kvm_memslots(kvm)) {
                         if ((slot->id >= KVM_USER_MEM_SLOTS) ||
                             (slot->id == mem->slot))
                                 continue;
@@ -873,7 +873,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
         slots = kvm_kvzalloc(sizeof(struct kvm_memslots));
         if (!slots)
                 goto out_free;
-        memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));
+        memcpy(slots, kvm_memslots(kvm), sizeof(struct kvm_memslots));
 
         if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {
                 slot = id_to_memslot(slots, mem->slot);
@@ -966,6 +966,7 @@ static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
 int kvm_get_dirty_log(struct kvm *kvm,
                         struct kvm_dirty_log *log, int *is_dirty)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         int r, i;
         unsigned long n;
@@ -975,7 +976,8 @@ int kvm_get_dirty_log(struct kvm *kvm,
         if (log->slot >= KVM_USER_MEM_SLOTS)
                 goto out;
 
-        memslot = id_to_memslot(kvm->memslots, log->slot);
+        slots = kvm_memslots(kvm);
+        memslot = id_to_memslot(slots, log->slot);
         r = -ENOENT;
         if (!memslot->dirty_bitmap)
                 goto out;
@@ -1024,6 +1026,7 @@ EXPORT_SYMBOL_GPL(kvm_get_dirty_log);
 int kvm_get_dirty_log_protect(struct kvm *kvm,
                         struct kvm_dirty_log *log, bool *is_dirty)
 {
+        struct kvm_memslots *slots;
         struct kvm_memory_slot *memslot;
         int r, i;
         unsigned long n;
@@ -1034,7 +1037,8 @@ int kvm_get_dirty_log_protect(struct kvm *kvm,
         if (log->slot >= KVM_USER_MEM_SLOTS)
                 goto out;
 
-        memslot = id_to_memslot(kvm->memslots, log->slot);
+        slots = kvm_memslots(kvm);
+        memslot = id_to_memslot(slots, log->slot);
 
         dirty_bitmap = memslot->dirty_bitmap;
         r = -ENOENT;