1 files changed, 12 insertions, 2 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 777fe533cfe7..48d5e697bf44 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -85,6 +85,8 @@ static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl,
 
 static bool kvm_rebooting;
 
+static bool largepages_enabled = true;
+
 #ifdef KVM_CAP_DEVICE_ASSIGNMENT
 static struct kvm_assigned_dev_kernel *kvm_find_assigned_dev(struct list_head *head,
                                                       int assigned_dev_id)
@@ -1174,9 +1176,11 @@ int __kvm_set_memory_region(struct kvm *kvm,
                 ugfn = new.userspace_addr >> PAGE_SHIFT;
                 /*
                  * If the gfn and userspace address are not aligned wrt each
-                 * other, disable large page support for this slot
+                 * other, or if explicitly asked to, disable large page
+                 * support for this slot
                  */
-                if ((base_gfn ^ ugfn) & (KVM_PAGES_PER_HPAGE - 1))
+                if ((base_gfn ^ ugfn) & (KVM_PAGES_PER_HPAGE - 1) ||
+                    !largepages_enabled)
                         for (i = 0; i < largepages; ++i)
                                 new.lpage_info[i].write_count = 1;
         }
@@ -1291,6 +1295,12 @@ out:
         return r;
 }
 
+void kvm_disable_largepages(void)
+{
+        largepages_enabled = false;
+}
+EXPORT_SYMBOL_GPL(kvm_disable_largepages);
+
 int is_error_page(struct page *page)
 {
         return page == bad_page;