powerpc/mm: Add pte_xchg() helper

We have five locations in 64-bit hash MMU code that do a cmpxchg() of a
PTE. Currently doing it inline OK, but in a future patch we will be
converting the PTEs to __be64 in some configs. In that case we will need
casts at every cmpxchg() site in order to keep sparse happy.

So move the logic into a helper, this is a reasonably nice cleanup on
its own.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h
index 7529aab068f5968a8a093ba2ddb5f42e9ab5b61c..42da513fec2d6ddeb43fc3f05be3a33c9c6852ad 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s_64.h
+++ b/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -319,11 +319,8 @@ static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing)
                if (writing && pte_write(old_pte))
                        new_pte = pte_mkdirty(new_pte);
 
-               if (pte_val(old_pte) == __cmpxchg_u64((unsigned long *)ptep,
-                                                     pte_val(old_pte),
-                                                     pte_val(new_pte))) {
+               if (pte_xchg(ptep, old_pte, new_pte))
                        break;
-               }
        }
        return new_pte;
 }

diff --git a/arch/powerpc/include/asm/pgtable-types.h b/arch/powerpc/include/asm/pgtable-types.h
index 1464e74178d87049f7ef73ff86a4c30ea806bb80..e7f4f3e0fcde94ba237fa2a269c32d40458cc8f2 100644 (file)
--- a/arch/powerpc/include/asm/pgtable-types.h
+++ b/arch/powerpc/include/asm/pgtable-types.h
@@ -54,4 +54,16 @@ typedef struct { pte_t pte; unsigned long hidx; } real_pte_t;
 #else
 typedef struct { pte_t pte; } real_pte_t;
 #endif
+
+#ifdef CONFIG_PPC_STD_MMU_64
+#include <asm/cmpxchg.h>
+
+static inline bool pte_xchg(pte_t *ptep, pte_t old, pte_t new)
+{
+       unsigned long *p = (unsigned long *)ptep;
+
+       return pte_val(old) == __cmpxchg_u64(p, pte_val(old), pte_val(new));
+}
+#endif
+
 #endif /* _ASM_POWERPC_PGTABLE_TYPES_H */

diff --git a/arch/powerpc/mm/hash64_4k.c b/arch/powerpc/mm/hash64_4k.c
index 47d1b26effc6a71115d371599590496fc2dd5b96..dbd3133a856284a8f580470e47d52ab951aad256 100644 (file)
--- a/arch/powerpc/mm/hash64_4k.c
+++ b/arch/powerpc/mm/hash64_4k.c
@@ -47,8 +47,8 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED;
                if (access & _PAGE_RW)
                        new_pte |= _PAGE_DIRTY;
-       } while (old_pte != __cmpxchg_u64((unsigned long *)ptep,
-                                         old_pte, new_pte));
+       } while (!pte_xchg(ptep, __pte(old_pte), __pte(new_pte)));
+
        /*
         * PP bits. _PAGE_USER is already PP bit 0x2, so we only
         * need to add in 0x1 if it's a read-only user page

diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c
index b2d659cf51c664f1379b8748feaa72146a146590..6fbf983b3ae5230cc95d1ac59882f7d48e558805 100644 (file)
--- a/arch/powerpc/mm/hash64_64k.c
+++ b/arch/powerpc/mm/hash64_64k.c
@@ -79,8 +79,8 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED | _PAGE_COMBO;
                if (access & _PAGE_RW)
                        new_pte |= _PAGE_DIRTY;
-       } while (old_pte != __cmpxchg_u64((unsigned long *)ptep,
-                                         old_pte, new_pte));
+       } while (!pte_xchg(ptep, __pte(old_pte), __pte(new_pte)));
+
        /*
         * Handle the subpage protection bits
         */
@@ -254,8 +254,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access,
                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED;
                if (access & _PAGE_RW)
                        new_pte |= _PAGE_DIRTY;
-       } while (old_pte != __cmpxchg_u64((unsigned long *)ptep,
-                                         old_pte, new_pte));
+       } while (!pte_xchg(ptep, __pte(old_pte), __pte(new_pte)));
 
        rflags = htab_convert_pte_flags(new_pte);
 

diff --git a/arch/powerpc/mm/hugetlbpage-hash64.c b/arch/powerpc/mm/hugetlbpage-hash64.c
index 8555fce902fea574608b42d2bb240009e3fe8371..9c051876127922212192720e6d08ca23f1a20f22 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage-hash64.c
+++ b/arch/powerpc/mm/hugetlbpage-hash64.c
@@ -57,8 +57,8 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,
                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED;
                if (access & _PAGE_RW)
                        new_pte |= _PAGE_DIRTY;
-       } while(old_pte != __cmpxchg_u64((unsigned long *)ptep,
-                                        old_pte, new_pte));
+       } while(!pte_xchg(ptep, __pte(old_pte), __pte(new_pte)));
+
        rflags = htab_convert_pte_flags(new_pte);
 
        sz = ((1UL) << shift);