powerpc/book3s: Use config independent helpers for page table walk
Subsystems (2)
PATCH 1/3 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.
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 21 +++++++++++++++ arch/powerpc/include/asm/pgtable.h | 24 +++++++++++++++++ arch/powerpc/include/asm/pte-walk.h | 28 ++++++++++++++++++-- arch/powerpc/kvm/book3s_64_mmu_radix.c | 12 +++------ arch/powerpc/mm/book3s64/radix_pgtable.c | 10 +++---- arch/powerpc/mm/pgtable.c | 16 +++++------ arch/powerpc/mm/pgtable_64.c | 12 ++++++--- arch/powerpc/mm/ptdump/ptdump.c | 6 ++--- arch/powerpc/xmon/xmon.c | 6 ++--- 9 files changed, 102 insertions(+), 33 deletions(-)
arch/powerpc/include/asm/book3s/64/pgtable.h +21 -0
@@ -1313,5 +1313,26 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_vareturn false; } +/* +* Like pmd_huge() and pmd_large(), but works regardless of config options +*/ +#define pmd_is_leaf pmd_is_leaf +static inline bool pmd_is_leaf (pmd_t pmd) +{ +return !!(pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE)); +} + +#define pud_is_leaf pud_is_leaf +static inline bool pud_is_leaf (pud_t pud) +{ +return !!(pud_raw (pud) &cpu_to_be64 (_PAGE_PTE)); +} + +#define pgd_is_leaf pgd_is_leaf +static inline bool pgd_is_leaf (pgd_t pgd) +{ +return !!(pgd_raw (pgd) &cpu_to_be64 (_PAGE_PTE)); +} +#endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */
arch/powerpc/include/asm/pgtable.h +24 -0
@@ -140,6 +140,30 @@ static inline void pte_frag_set(mm_context_t *ctx, void *p) }#endif +#ifndef pmd_is_leaf +#define pmd_is_leaf pmd_is_leaf +static inline bool pmd_is_leaf (pmd_t pmd) +{ +return false; +} +#endif + +#ifndef pud_is_leaf +#define pud_is_leaf pud_is_leaf +static inline bool pud_is_leaf (pud_t pud) +{ +return false; +} +#endif + +#ifndef pgd_is_leaf +#define pgd_is_leaf pgd_is_leaf +static inline bool pgd_is_leaf (pgd_t pgd) +{ +return false; +} +#endif +#endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PGTABLE_H */
arch/powerpc/include/asm/pte-walk.h +26 -2
@@ -10,8 +10,20 @@ extern pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,static inline pte_t *find_linux_pte (pgd_t *pgdir,unsigned long ea,bool *is_thp,unsigned *hshift) { +pte_t *pte; +VM_WARN (!arch_irqs_disabled (),"%s called with irq enabled\n" , __func__); -return __find_linux_pte (pgdir, ea, is_thp, hshift); + pte =__find_linux_pte (pgdir, ea, is_thp, hshift); + +#if defined(CONFIG_DEBUG_VM ) && \ + !(defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE )) +/* +* We should not find huge page if these configs are not enabled. +*/ +if (hshift) +WARN_ON (*hshift); +#endif +return pte; }static inline pte_t *find_init_mm_pte (unsigned long ea,unsigned *hshift)
@@ -26,10 +38,22 @@ static inline pte_t *find_init_mm_pte(unsigned long ea, unsigned *hshift)static inline pte_t *find_current_mm_pte (pgd_t *pgdir,unsigned long ea,bool *is_thp,unsigned *hshift) { +pte_t *pte; +VM_WARN (!arch_irqs_disabled (),"%s called with irq enabled\n" , __func__);VM_WARN (pgdir != current->mm->pgd,"%s lock less page table lookup called on wrong mm\n" , __func__); -return __find_linux_pte (pgdir, ea, is_thp, hshift); + pte =__find_linux_pte (pgdir, ea, is_thp, hshift); + +#if defined(CONFIG_DEBUG_VM ) && \ + !(defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE )) +/* +* We should not find huge page if these configs are not enabled. +*/ +if (hshift) +WARN_ON (*hshift); +#endif +return pte; }#endif /* _ASM_POWERPC_PTE_WALK_H */
arch/powerpc/kvm/book3s_64_mmu_radix.c +3 -9
@@ -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 */
arch/powerpc/mm/book3s64/radix_pgtable.c +5 -5
@@ -202,14 +202,14 @@ void radix__change_memory_range(unsigned long start, unsigned long end, pudp =pud_alloc (&init_mm, pgdp, idx);if (!pudp)continue ; -if (pud_huge (*pudp)) { +if (pud_is_leaf (*pudp)) { ptep = (pte_t *)pudp; goto update_the_pte; } pmdp =pmd_alloc (&init_mm, pudp, idx);if (!pmdp)continue ; -if (pmd_huge (*pmdp)) { +if (pmd_is_leaf (*pmdp)) { ptep =pmdp_ptep (pmdp); goto update_the_pte; }
@@ -837,7 +837,7 @@ static void remove_pmd_table(pmd_t *pmd_start, unsigned long addr,if (!pmd_present (*pmd))continue ; -if (pmd_huge (*pmd)) { +if (pmd_is_leaf (*pmd)) {split_kernel_mapping (addr, end,PMD_SIZE , (pte_t *)pmd);continue ; }
@@ -862,7 +862,7 @@ static void remove_pud_table(pud_t *pud_start, unsigned long addr,if (!pud_present (*pud))continue ; -if (pud_huge (*pud)) { +if (pud_is_leaf (*pud)) {split_kernel_mapping (addr, end,PUD_SIZE , (pte_t *)pud);continue ; }
@@ -888,7 +888,7 @@ static void __meminit remove_pagetable(unsigned long start, unsigned long end)if (!pgd_present (*pgd))continue ; -if (pgd_huge (*pgd)) { +if (pgd_is_leaf (*pgd)) {split_kernel_mapping (addr, end,PGDIR_SIZE , (pte_t *)pgd);continue ;/* This should fall through? */
arch/powerpc/mm/pgtable.c +8 -8
@@ -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);
@@ -385,15 +388,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;
arch/powerpc/mm/pgtable_64.c +9 -3
@@ -296,16 +296,20 @@ EXPORT_SYMBOL(__iounmap_at);/* 4 level page table */ struct page *pgd_page (pgd_t pgd) { -if (pgd_huge (pgd)) +if (pgd_is_leaf (pgd)) { +VM_WARN_ON (!pgd_huge (pgd));return pte_page (pgd_pte (pgd)); + }return virt_to_page (pgd_page_vaddr (pgd)); }#endif struct page *pud_page (pud_t pud) { -if (pud_huge (pud)) +if (pud_is_leaf (pud)) { +VM_WARN_ON (!pud_huge (pud));return pte_page (pud_pte (pud)); + }return virt_to_page (pud_page_vaddr (pud)); }
@@ -315,8 +319,10 @@ struct page *pud_page(pud_t pud)*/ struct page *pmd_page (pmd_t pmd) { -if (pmd_large (pmd) ||pmd_huge (pmd) ||pmd_devmap (pmd)) +if (pmd_is_leaf (pmd)) { +VM_WARN_ON (!(pmd_large (pmd) ||pmd_huge (pmd) ||pmd_devmap (pmd)));return pte_page (pmd_pte (pmd)); + }return virt_to_page (pmd_page_vaddr (pmd)); }
arch/powerpc/mm/ptdump/ptdump.c +3 -3
@@ -277,7 +277,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)for (i =0 ; i <PTRS_PER_PMD ; i++, pmd++) { addr = start + i *PMD_SIZE ; -if (!pmd_none (*pmd) && !pmd_huge (*pmd)) +if (!pmd_none (*pmd) && !pmd_is_leaf (*pmd))/* pmd exists */ walk_pte (st, pmd, addr);else
@@ -293,7 +293,7 @@ static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start)for (i =0 ; i <PTRS_PER_PUD ; i++, pud++) { addr = start + i *PUD_SIZE ; -if (!pud_none (*pud) && !pud_huge (*pud)) +if (!pud_none (*pud) && !pud_is_leaf (*pud))/* pud exists */ walk_pmd (st, pud, addr);else
@@ -314,7 +314,7 @@ static void walk_pagetables(struct pg_state *st)* the hash pagetable. */ for (i =0 ; i <PTRS_PER_PGD ; i++, pgd++, addr +=PGDIR_SIZE ) { -if (!pgd_none (*pgd) && !pgd_huge (*pgd)) +if (!pgd_none (*pgd) && !pgd_is_leaf (*pgd))/* pgd exists */ walk_pud (st, pgd, addr);else
arch/powerpc/xmon/xmon.c +3 -3
@@ -3094,7 +3094,7 @@ static void show_pte(unsigned long addr)printf ("pgd @ 0x%px\n" , pgdir); -if (pgd_huge (*pgdp)) { +if (pgd_is_leaf (*pgdp)) {format_pte (pgdp,pgd_val (*pgdp));return ; }
@@ -3107,7 +3107,7 @@ static void show_pte(unsigned long addr)return ; } -if (pud_huge (*pudp)) { +if (pud_is_leaf (*pudp)) {format_pte (pudp,pud_val (*pudp));return ; }
@@ -3121,7 +3121,7 @@ static void show_pte(unsigned long addr)return ; } -if (pmd_huge (*pmdp)) { +if (pmd_is_leaf (*pmdp)) {format_pte (pmdp,pmd_val (*pmdp));return ; }
Signature · 1 line
2.21.0
PATCH 2/3 powerpc/mm: pmd_devmap implies pmd_large().
large devmap usage is dependent on THP. Hence once check is sufficient.
--- arch/powerpc/mm/book3s64/pgtable.c | 2 +- arch/powerpc/mm/pgtable_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/mm/book3s64/pgtable.c +1 -1
@@ -76,7 +76,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,WARN_ON (pte_hw_valid (pmd_pte (*pmdp)) && !pte_protnone (pmd_pte (*pmdp)));assert_spin_locked (pmd_lockptr (mm, pmdp)); -WARN_ON (!(pmd_large (pmd) ||pmd_devmap (pmd))); +WARN_ON (!(pmd_large (pmd)));#endif trace_hugepage_set_pmd (addr,pmd_val (pmd));return set_pte_at (mm, addr,pmdp_ptep (pmdp),pmd_pte (pmd));
arch/powerpc/mm/pgtable_64.c +1 -1
@@ -320,7 +320,7 @@ struct page *pud_page(pud_t pud)struct page *pmd_page (pmd_t pmd) {if (pmd_is_leaf (pmd)) { -VM_WARN_ON (!(pmd_large (pmd) ||pmd_huge (pmd) ||pmd_devmap (pmd))); +VM_WARN_ON (!(pmd_large (pmd) ||pmd_huge (pmd)));return pte_page (pmd_pte (pmd)); }return virt_to_page (pmd_page_vaddr (pmd));
Signature · 1 line
2.21.0
PATCH 3/3 powerpc/mm: Remove radix dependency on HugeTLB page
In reply to Aneesh Kumar K.VNow that we have switched the page table walk to use pmd_is_leaf we can now revert commit 8adddf349fda ("powerpc/mm/radix: Make Radix require HUGETLB_PAGE")
--- arch/powerpc/platforms/Kconfig.cputype | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/Kconfig.cputype +1 -1
@@ -330,7 +330,7 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK config PPC_RADIX_MMU bool "Radix MMU Support" - depends on PPC_BOOK3S_64 && HUGETLB_PAGE + depends on PPC_BOOK3S_64 select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA select PPC_HAVE_KUEP select PPC_HAVE_KUAP
Signature · 1 line
2.21.0
Quoted 9 lines · Aneesh Kumar K.V
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 <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/d6eacedd1f0ebf00bdf1c77715d194f7c1036fd4
cheers