powerpc/book3s: Use config independent helpers for page table walk

Even when we have HugeTLB and THP disabled, kernel linear map can still be
mapped with hugepages. This is only an issue with radix translation because hash
MMU doesn't map kernel linear range in linux page table and other kernel
map areas are not mapped using hugepage.

Add config independent helpers and put WARN_ON() when we don't expect things
to be mapped via hugepages.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index 533fc6fa6726..2029e585e5c3 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -340,10 +340,11 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
         if (pgd_none(pgd))
                 return NULL;
 
-        if (pgd_huge(pgd)) {
+        if (pgd_is_leaf(pgd)) {
                 ret_pte = (pte_t *)pgdp;
                 goto out;
         }
+
         if (is_hugepd(__hugepd(pgd_val(pgd)))) {
                 hpdp = (hugepd_t *)&pgd;
                 goto out_huge;
@@ -361,14 +362,16 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
         if (pud_none(pud))
                 return NULL;
 
-        if (pud_huge(pud)) {
+        if (pud_is_leaf(pud)) {
                 ret_pte = (pte_t *)pudp;
                 goto out;
         }
+
         if (is_hugepd(__hugepd(pud_val(pud)))) {
                 hpdp = (hugepd_t *)&pud;
                 goto out_huge;
         }
+
         pdshift = PMD_SHIFT;
         pmdp = pmd_offset(&pud, ea);
         pmd  = READ_ONCE(*pmdp);
@@ -397,15 +400,12 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
                 ret_pte = (pte_t *)pmdp;
                 goto out;
         }
-        /*
-         * pmd_large check below will handle the swap pmd pte
-         * we need to do both the check because they are config
-         * dependent.
-         */
-        if (pmd_huge(pmd) || pmd_large(pmd)) {
+
+        if (pmd_is_leaf(pmd)) {
                 ret_pte = (pte_t *)pmdp;
                 goto out;
         }
+
         if (is_hugepd(__hugepd(pmd_val(pmd)))) {
                 hpdp = (hugepd_t *)&pmd;
                 goto out_huge;