5 files changed, 50 insertions, 31 deletions

diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index 4fdc27c80f4c..3f1bb5a36c27 100644
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -12,7 +12,6 @@
 #include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/bootmem.h>
 #include <linux/init.h>
 #include <linux/memblock.h>
 #include <linux/sizes.h>
@@ -154,7 +153,7 @@ EXPORT_SYMBOL_GPL(kvm_release_hpt);
  * kvm_cma_reserve() - reserve area for kvm hash pagetable
  *
  * This function reserves memory from early allocator. It should be
- * called by arch specific code once the early allocator (memblock or bootmem)
+ * called by arch specific code once the memblock allocator
  * has been activated and all other subsystems have already allocated/reserved
  * memory.
  */
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index edb2ccdbb2ba..65c105b17a25 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -201,8 +201,6 @@ kvmppc_primary_no_guest:
         bge     kvm_novcpu_exit /* another thread already exiting */
         li      r3, NAPPING_NOVCPU
         stb     r3, HSTATE_NAPPING(r13)
-        li      r3, 1
-        stb     r3, HSTATE_HWTHREAD_REQ(r13)
 
         b       kvm_do_nap
 
@@ -293,6 +291,8 @@ kvm_start_guest:
         /* if we have no vcpu to run, go back to sleep */
         beq     kvm_no_guest
 
+kvm_secondary_got_guest:
+
         /* Set HSTATE_DSCR(r13) to something sensible */
         ld      r6, PACA_DSCR(r13)
         std     r6, HSTATE_DSCR(r13)
@@ -318,27 +318,46 @@ kvm_start_guest:
         stwcx.  r3, 0, r4
         bne     51b
 
+/*
+ * At this point we have finished executing in the guest.
+ * We need to wait for hwthread_req to become zero, since
+ * we may not turn on the MMU while hwthread_req is non-zero.
+ * While waiting we also need to check if we get given a vcpu to run.
+ */
 kvm_no_guest:
-        li      r0, KVM_HWTHREAD_IN_NAP
+        lbz     r3, HSTATE_HWTHREAD_REQ(r13)
+        cmpwi   r3, 0
+        bne     53f
+        HMT_MEDIUM
+        li      r0, KVM_HWTHREAD_IN_KERNEL
         stb     r0, HSTATE_HWTHREAD_STATE(r13)
-kvm_do_nap:
-        /* Clear the runlatch bit before napping */
-        mfspr   r2, SPRN_CTRLF
-        clrrdi  r2, r2, 1
-        mtspr   SPRN_CTRLT, r2
-
+        /* need to recheck hwthread_req after a barrier, to avoid race */
+        sync
+        lbz     r3, HSTATE_HWTHREAD_REQ(r13)
+        cmpwi   r3, 0
+        bne     54f
+/*
+ * We jump to power7_wakeup_loss, which will return to the caller
+ * of power7_nap in the powernv cpu offline loop.  The value we
+ * put in r3 becomes the return value for power7_nap.
+ */
         li      r3, LPCR_PECE0
         mfspr   r4, SPRN_LPCR
         rlwimi  r4, r3, 0, LPCR_PECE0 | LPCR_PECE1
         mtspr   SPRN_LPCR, r4
-        isync
-        std     r0, HSTATE_SCRATCH0(r13)
-        ptesync
-        ld      r0, HSTATE_SCRATCH0(r13)
-1:      cmpd    r0, r0
-        bne     1b
-        nap
-        b       .
+        li      r3, 0
+        b       power7_wakeup_loss
+
+53:     HMT_LOW
+        ld      r4, HSTATE_KVM_VCPU(r13)
+        cmpdi   r4, 0
+        beq     kvm_no_guest
+        HMT_MEDIUM
+        b       kvm_secondary_got_guest
+
+54:     li      r0, KVM_HWTHREAD_IN_KVM
+        stb     r0, HSTATE_HWTHREAD_STATE(r13)
+        b       kvm_no_guest
 
 /******************************************************************************
  *                                                                            *
@@ -2172,6 +2191,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206)
          * occurs, with PECE1, PECE0 and PECEDP set in LPCR. Also clear the
          * runlatch bit before napping.
          */
+kvm_do_nap:
         mfspr   r2, SPRN_CTRLF
         clrrdi  r2, r2, 1
         mtspr   SPRN_CTRLT, r2
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 2e02ed849f36..16095841afe1 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -76,11 +76,11 @@ static inline int local_sid_setup_one(struct id *entry)
         unsigned long sid;
         int ret = -1;
 
-        sid = ++(__get_cpu_var(pcpu_last_used_sid));
+        sid = __this_cpu_inc_return(pcpu_last_used_sid);
         if (sid < NUM_TIDS) {
-                __get_cpu_var(pcpu_sids).entry[sid] = entry;
+                __this_cpu_write(pcpu_sids)entry[sid], entry);
                 entry->val = sid;
-                entry->pentry = &__get_cpu_var(pcpu_sids).entry[sid];
+                entry->pentry = this_cpu_ptr(&pcpu_sids.entry[sid]);
                 ret = sid;
         }
 
@@ -108,8 +108,8 @@ static inline int local_sid_setup_one(struct id *entry)
 static inline int local_sid_lookup(struct id *entry)
 {
         if (entry && entry->val != 0 &&
-            __get_cpu_var(pcpu_sids).entry[entry->val] == entry &&
-            entry->pentry == &__get_cpu_var(pcpu_sids).entry[entry->val])
+            __this_cpu_read(pcpu_sids.entry[entry->val]) == entry &&
+            entry->pentry == this_cpu_ptr(&pcpu_sids.entry[entry->val]))
                 return entry->val;
         return -1;
 }
@@ -117,8 +117,8 @@ static inline int local_sid_lookup(struct id *entry)
 /* Invalidate all id mappings on local core -- call with preempt disabled */
 static inline void local_sid_destroy_all(void)
 {
-        __get_cpu_var(pcpu_last_used_sid) = 0;
-        memset(&__get_cpu_var(pcpu_sids), 0, sizeof(__get_cpu_var(pcpu_sids)));
+        __this_cpu_write(pcpu_last_used_sid, 0);
+        memset(this_cpu_ptr(&pcpu_sids), 0, sizeof(pcpu_sids));
 }
 
 static void *kvmppc_e500_id_table_alloc(struct kvmppc_vcpu_e500 *vcpu_e500)
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c
index 769778f855b0..cc536d4a75ef 100644
--- a/arch/powerpc/kvm/e500_mmu_host.c
+++ b/arch/powerpc/kvm/e500_mmu_host.c
@@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
         if (unlikely((pr && !(mas3 & MAS3_UX)) ||
                      (!pr && !(mas3 & MAS3_SX)))) {
                 pr_err_ratelimited(
-                        "%s: Instuction emulation from guest addres %08lx without execute permission\n",
+                        "%s: Instruction emulation from guest address %08lx without execute permission\n",
                         __func__, geaddr);
                 return EMULATE_AGAIN;
         }
@@ -673,7 +673,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
         if (has_feature(vcpu, VCPU_FTR_MMU_V2) &&
             unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) {
                 pr_err_ratelimited(
-                        "%s: Instuction emulation from guest addres %08lx mismatches storage attributes\n",
+                        "%s: Instruction emulation from guest address %08lx mismatches storage attributes\n",
                         __func__, geaddr);
                 return EMULATE_AGAIN;
         }
@@ -686,7 +686,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
 
         /* Guard against emulation from devices area */
         if (unlikely(!page_is_ram(pfn))) {
-                pr_err_ratelimited("%s: Instruction emulation from non-RAM host addres %08llx is not supported\n",
+                pr_err_ratelimited("%s: Instruction emulation from non-RAM host address %08llx is not supported\n",
                          __func__, addr);
                 return EMULATE_AGAIN;
         }
diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c
index 2fdc8722e324..cda695de8aa7 100644
--- a/arch/powerpc/kvm/e500mc.c
+++ b/arch/powerpc/kvm/e500mc.c
@@ -144,9 +144,9 @@ static void kvmppc_core_vcpu_load_e500mc(struct kvm_vcpu *vcpu, int cpu)
         mtspr(SPRN_GESR, vcpu->arch.shared->esr);
 
         if (vcpu->arch.oldpir != mfspr(SPRN_PIR) ||
-            __get_cpu_var(last_vcpu_of_lpid)[get_lpid(vcpu)] != vcpu) {
+            __this_cpu_read(last_vcpu_of_lpid[get_lpid(vcpu)]) != vcpu) {
                 kvmppc_e500_tlbil_all(vcpu_e500);
-                __get_cpu_var(last_vcpu_of_lpid)[get_lpid(vcpu)] = vcpu;
+                __this_cpu_write(last_vcpu_of_lpid[get_lpid(vcpu)], vcpu);
         }
 }