Merge tag 'kvm-arm-for-3.14' of git://git.linaro.org/people/christoffer.dall/linux-kvm-arm into kvm-queue

4 files changed, 38 insertions, 29 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index b92ff6d3e34b..2d4b4a8068c8 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -489,15 +489,6 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
                         return ret;
         }
 
-        /*
-         * Handle the "start in power-off" case by calling into the
-         * PSCI code.
-         */
-        if (test_and_clear_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) {
-                *vcpu_reg(vcpu, 0) = KVM_PSCI_FN_CPU_OFF;
-                kvm_psci_call(vcpu);
-        }
-
         return 0;
 }
 
@@ -711,6 +702,24 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level,
         return -EINVAL;
 }
 
+static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,
+                                         struct kvm_vcpu_init *init)
+{
+        int ret;
+
+        ret = kvm_vcpu_set_target(vcpu, init);
+        if (ret)
+                return ret;
+
+        /*
+         * Handle the "start in power-off" case by marking the VCPU as paused.
+         */
+        if (__test_and_clear_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))
+                vcpu->arch.pause = true;
+
+        return 0;
+}
+
 long kvm_arch_vcpu_ioctl(struct file *filp,
                          unsigned int ioctl, unsigned long arg)
 {
@@ -724,8 +733,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                 if (copy_from_user(&init, argp, sizeof(init)))
                         return -EFAULT;
 
-                return kvm_vcpu_set_target(vcpu, &init);
-
+                return kvm_arch_vcpu_ioctl_vcpu_init(vcpu, &init);
         }
         case KVM_SET_ONE_REG:
         case KVM_GET_ONE_REG: {
diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c
index a92079011a83..0de91fc6de0f 100644
--- a/arch/arm/kvm/handle_exit.c
+++ b/arch/arm/kvm/handle_exit.c
@@ -26,8 +26,6 @@
 
 #include "trace.h"
 
-#include "trace.h"
-
 typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *);
 
 static int handle_svc_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 580906989db1..7789857d1470 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -667,14 +667,16 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
                 gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
         } else {
                 /*
-                 * Pages belonging to VMAs not aligned to the PMD mapping
-                 * granularity cannot be mapped using block descriptors even
-                 * if the pages belong to a THP for the process, because the
-                 * stage-2 block descriptor will cover more than a single THP
-                 * and we loose atomicity for unmapping, updates, and splits
-                 * of the THP or other pages in the stage-2 block range.
+                 * Pages belonging to memslots that don't have the same
+                 * alignment for userspace and IPA cannot be mapped using
+                 * block descriptors even if the pages belong to a THP for
+                 * the process, because the stage-2 block descriptor will
+                 * cover more than a single THP and we loose atomicity for
+                 * unmapping, updates, and splits of the THP or other pages
+                 * in the stage-2 block range.
                  */
-                if (vma->vm_start & ~PMD_MASK)
+                if ((memslot->userspace_addr & ~PMD_MASK) !=
+                    ((memslot->base_gfn << PAGE_SHIFT) & ~PMD_MASK))
                         force_pte = true;
         }
         up_read(&current->mm->mmap_sem);
@@ -916,9 +918,9 @@ int kvm_mmu_init(void)
 {
         int err;
 
-        hyp_idmap_start = virt_to_phys(__hyp_idmap_text_start);
-        hyp_idmap_end = virt_to_phys(__hyp_idmap_text_end);
-        hyp_idmap_vector = virt_to_phys(__kvm_hyp_init);
+        hyp_idmap_start = kvm_virt_to_phys(__hyp_idmap_text_start);
+        hyp_idmap_end = kvm_virt_to_phys(__hyp_idmap_text_end);
+        hyp_idmap_vector = kvm_virt_to_phys(__kvm_hyp_init);
 
         if ((hyp_idmap_start ^ hyp_idmap_end) & PAGE_MASK) {
                 /*
@@ -945,7 +947,7 @@ int kvm_mmu_init(void)
                  */
                 kvm_flush_dcache_to_poc(init_bounce_page, len);
 
-                phys_base = virt_to_phys(init_bounce_page);
+                phys_base = kvm_virt_to_phys(init_bounce_page);
                 hyp_idmap_vector += phys_base - hyp_idmap_start;
                 hyp_idmap_start = phys_base;
                 hyp_idmap_end = phys_base + len;
diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c
index 0881bf169fbc..448f60e8d23c 100644
--- a/arch/arm/kvm/psci.c
+++ b/arch/arm/kvm/psci.c
@@ -54,15 +54,15 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
                 }
         }
 
-        if (!vcpu)
+        /*
+         * Make sure the caller requested a valid CPU and that the CPU is
+         * turned off.
+         */
+        if (!vcpu || !vcpu->arch.pause)
                 return KVM_PSCI_RET_INVAL;
 
         target_pc = *vcpu_reg(source_vcpu, 2);
 
-        wq = kvm_arch_vcpu_wq(vcpu);
-        if (!waitqueue_active(wq))
-                return KVM_PSCI_RET_INVAL;
-
         kvm_reset_vcpu(vcpu);
 
         /* Gracefully handle Thumb2 entry point */
@@ -79,6 +79,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)
         vcpu->arch.pause = false;
         smp_mb();               /* Make sure the above is visible */
 
+        wq = kvm_arch_vcpu_wq(vcpu);
         wake_up_interruptible(wq);
 
         return KVM_PSCI_RET_SUCCESS;