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, 3 insertions, 9 deletions

diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index f55ef071883f..91efee7f0329 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -363,12 +363,6 @@ static void kvmppc_pte_free(pte_t *ptep)
         kmem_cache_free(kvm_pte_cache, ptep);
 }
 
-/* Like pmd_huge() and pmd_large(), but works regardless of config options */
-static inline int pmd_is_leaf(pmd_t pmd)
-{
-        return !!(pmd_val(pmd) & _PAGE_PTE);
-}
-
 static pmd_t *kvmppc_pmd_alloc(void)
 {
         return kmem_cache_alloc(kvm_pmd_cache, GFP_KERNEL);
@@ -489,7 +483,7 @@ static void kvmppc_unmap_free_pud(struct kvm *kvm, pud_t *pud,
         for (iu = 0; iu < PTRS_PER_PUD; ++iu, ++p) {
                 if (!pud_present(*p))
                         continue;
-                if (pud_huge(*p)) {
+                if (pud_is_leaf(*p)) {
                         pud_clear(p);
                 } else {
                         pmd_t *pmd;
@@ -588,7 +582,7 @@ int kvmppc_create_pte(struct kvm *kvm, pgd_t *pgtable, pte_t pte,
                 new_pud = pud_alloc_one(kvm->mm, gpa);
 
         pmd = NULL;
-        if (pud && pud_present(*pud) && !pud_huge(*pud))
+        if (pud && pud_present(*pud) && !pud_is_leaf(*pud))
                 pmd = pmd_offset(pud, gpa);
         else if (level <= 1)
                 new_pmd = kvmppc_pmd_alloc();
@@ -611,7 +605,7 @@ int kvmppc_create_pte(struct kvm *kvm, pgd_t *pgtable, pte_t pte,
                 new_pud = NULL;
         }
         pud = pud_offset(pgd, gpa);
-        if (pud_huge(*pud)) {
+        if (pud_is_leaf(*pud)) {
                 unsigned long hgpa = gpa & PUD_MASK;
 
                 /* Check if we raced and someone else has set the same thing */