1 files changed, 27 insertions, 14 deletions

diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index ae4962a06476..9c4880ddecd6 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -283,19 +283,17 @@ static long native_hpte_remove(unsigned long hpte_group)
 
 static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                                  unsigned long vpn, int bpsize,
-                                 int apsize, int ssize, int local)
+                                 int apsize, int ssize, unsigned long flags)
 {
         struct hash_pte *hptep = htab_address + slot;
         unsigned long hpte_v, want_v;
-        int ret = 0;
+        int ret = 0, local = 0;
 
         want_v = hpte_encode_avpn(vpn, bpsize, ssize);
 
         DBG_LOW("    update(vpn=%016lx, avpnv=%016lx, group=%lx, newpp=%lx)",
                 vpn, want_v & HPTE_V_AVPN, slot, newpp);
 
-        native_lock_hpte(hptep);
-
         hpte_v = be64_to_cpu(hptep->v);
         /*
          * We need to invalidate the TLB always because hpte_remove doesn't do
@@ -308,15 +306,30 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
                 DBG_LOW(" -> miss\n");
                 ret = -1;
         } else {
-                DBG_LOW(" -> hit\n");
-                /* Update the HPTE */
-                hptep->r = cpu_to_be64((be64_to_cpu(hptep->r) & ~(HPTE_R_PP | HPTE_R_N)) |
-                        (newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C)));
+                native_lock_hpte(hptep);
+                /* recheck with locks held */
+                hpte_v = be64_to_cpu(hptep->v);
+                if (unlikely(!HPTE_V_COMPARE(hpte_v, want_v) ||
+                             !(hpte_v & HPTE_V_VALID))) {
+                        ret = -1;
+                } else {
+                        DBG_LOW(" -> hit\n");
+                        /* Update the HPTE */
+                        hptep->r = cpu_to_be64((be64_to_cpu(hptep->r) &
+                                                ~(HPTE_R_PP | HPTE_R_N)) |
+                                               (newpp & (HPTE_R_PP | HPTE_R_N |
+                                                         HPTE_R_C)));
+                }
+                native_unlock_hpte(hptep);
         }
-        native_unlock_hpte(hptep);
 
-        /* Ensure it is out of the tlb too. */
-        tlbie(vpn, bpsize, apsize, ssize, local);
+        if (flags & HPTE_LOCAL_UPDATE)
+                local = 1;
+        /*
+         * Ensure it is out of the tlb too if it is not a nohpte fault
+         */
+        if (!(flags & HPTE_NOHPTE_UPDATE))
+                tlbie(vpn, bpsize, apsize, ssize, local);
 
         return ret;
 }
@@ -419,7 +432,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn,
 static void native_hugepage_invalidate(unsigned long vsid,
                                        unsigned long addr,
                                        unsigned char *hpte_slot_array,
-                                       int psize, int ssize)
+                                       int psize, int ssize, int local)
 {
         int i;
         struct hash_pte *hptep;
@@ -465,7 +478,7 @@ static void native_hugepage_invalidate(unsigned long vsid,
                  * instruction compares entry_VA in tlb with the VA specified
                  * here
                  */
-                tlbie(vpn, psize, actual_psize, ssize, 0);
+                tlbie(vpn, psize, actual_psize, ssize, local);
         }
         local_irq_restore(flags);
 }
@@ -629,7 +642,7 @@ static void native_flush_hash_range(unsigned long number, int local)
         unsigned long want_v;
         unsigned long flags;
         real_pte_t pte;
-        struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+        struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
         unsigned long psize = batch->psize;
         int ssize = batch->ssize;
         int i;