[051/158] powerpc: mm: add p?d_leaf() definitions

Commit Message

Andrew Morton Dec. 1, 2019, 1:52 a.m. UTC

From: Steven Price <[e-mail]>
Subject: powerpc: mm: add p?d_leaf() definitions

walk_page_range() is going to be allowed to walk page tables other than
those of user space.  For this it needs to know when it has reached a
'leaf' entry in the page tables.  This information is provided by the
p?d_leaf() functions/macros.

For powerpc pmd_large() already exists and does what we want, so hoist it
out of the CONFIG_TRANSPARENT_HUGEPAGE condition and implement the other
levels.  Macros are used to provide the generic p?d_leaf() names.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Steven Price <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Albert Ou <[e-mail]>
Cc: Alexander Potapenko <[e-mail]>
Cc: Alexandre Ghiti <[e-mail]>
Cc: Andrey Ryabinin <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: Christian Borntraeger <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Dave Jiang <[e-mail]>
Cc: David S. Miller <[e-mail]>
Cc: Dmitry Vyukov <[e-mail]>
Cc: Heiko Carstens <[e-mail]>
Cc: "H. Peter Anvin" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: James Hogan <[e-mail]>
Cc: James Morse <[e-mail]>
Cc: "Liang, Kan" <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: Naoya Horiguchi <[e-mail]>
Cc: Palmer Dabbelt <[e-mail]>
Cc: Paul Burton <[e-mail]>
Cc: Paul Walmsley <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Ralf Baechle <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Shiraz Hashim <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Vasily Gorbik <[e-mail]>
Cc: Vineet Gupta <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Zong Li <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 arch/powerpc/include/asm/book3s/64/pgtable.h |   30 +++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

Patch

--- a/arch/powerpc/include/asm/book3s/64/pgtable.h~powerpc-mm-add-pd_leaf-definitions
+++ a/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -923,6 +923,12 @@  static inline int pud_present(pud_t pud)
 	return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PRESENT));
 }
 
+#define pud_leaf	pud_large
+static inline int pud_large(pud_t pud)
+{
+	return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE));
+}
+
 extern struct page *pud_page(pud_t pud);
 extern struct page *pmd_page(pmd_t pmd);
 static inline pte_t pud_pte(pud_t pud)
@@ -966,6 +972,12 @@  static inline int pgd_present(pgd_t pgd)
 	return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PRESENT));
 }
 
+#define pgd_leaf	pgd_large
+static inline int pgd_large(pgd_t pgd)
+{
+	return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PTE));
+}
+
 static inline pte_t pgd_pte(pgd_t pgd)
 {
 	return __pte_raw(pgd_raw(pgd));
@@ -1133,6 +1145,15 @@  static inline bool pmd_access_permitted(
 	return pte_access_permitted(pmd_pte(pmd), write);
 }
 
+#define pmd_leaf	pmd_large
+/*
+ * returns true for pmd migration entries, THP, devmap, hugetlb
+ */
+static inline int pmd_large(pmd_t pmd)
+{
+	return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE));
+}
+
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 extern pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot);
 extern pmd_t mk_pmd(struct page *page, pgprot_t pgprot);
@@ -1159,15 +1180,6 @@  pmd_hugepage_update(struct mm_struct *mm
 	return hash__pmd_hugepage_update(mm, addr, pmdp, clr, set);
 }
 
-/*
- * returns true for pmd migration entries, THP, devmap, hugetlb
- * But compile time dependent on THP config
- */
-static inline int pmd_large(pmd_t pmd)
-{
-	return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE));
-}
-
 static inline pmd_t pmd_mknotpresent(pmd_t pmd)
 {
 	return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT);