Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Gleb Natapov.

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: kvm_clear_guest_page(): fix empty_zero_page usage
  kvm: mmu: delay mmu audit activation
  arm/arm64: KVM: Fix hyp mappings of vmalloc regions

2 files changed, 29 insertions, 7 deletions

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 371958370de4..580906989db1 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -334,6 +334,17 @@ out:
         return err;
 }
 
+static phys_addr_t kvm_kaddr_to_phys(void *kaddr)
+{
+        if (!is_vmalloc_addr(kaddr)) {
+                BUG_ON(!virt_addr_valid(kaddr));
+                return __pa(kaddr);
+        } else {
+                return page_to_phys(vmalloc_to_page(kaddr)) +
+                       offset_in_page(kaddr);
+        }
+}
+
 /**
  * create_hyp_mappings - duplicate a kernel virtual address range in Hyp mode
  * @from:       The virtual kernel start address of the range
@@ -345,16 +356,27 @@ out:
  */
 int create_hyp_mappings(void *from, void *to)
 {
-        unsigned long phys_addr = virt_to_phys(from);
+        phys_addr_t phys_addr;
+        unsigned long virt_addr;
         unsigned long start = KERN_TO_HYP((unsigned long)from);
         unsigned long end = KERN_TO_HYP((unsigned long)to);
 
-        /* Check for a valid kernel memory mapping */
-        if (!virt_addr_valid(from) || !virt_addr_valid(to - 1))
-                return -EINVAL;
+        start = start & PAGE_MASK;
+        end = PAGE_ALIGN(end);
 
-        return __create_hyp_mappings(hyp_pgd, start, end,
-                                     __phys_to_pfn(phys_addr), PAGE_HYP);
+        for (virt_addr = start; virt_addr < end; virt_addr += PAGE_SIZE) {
+                int err;
+
+                phys_addr = kvm_kaddr_to_phys(from + virt_addr - start);
+                err = __create_hyp_mappings(hyp_pgd, virt_addr,
+                                            virt_addr + PAGE_SIZE,
+                                            __phys_to_pfn(phys_addr),
+                                            PAGE_HYP);
+                if (err)
+                        return err;
+        }
+
+        return 0;
 }
 
 /**
diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c
index daff69e21150..1185fe7a7f47 100644
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -296,4 +296,4 @@ static struct kernel_param_ops audit_param_ops = {
         .get = param_get_bool,
 };
 
-module_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644);
+arch_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644);