--- v9
+++ v1
@@ -1,28 +1,72 @@
-Part of the conversions to replace pgtable constructor/destructors with
-ptdesc equivalents.
+As part of the conversions to replace pgtable constructor/destructors with
+ptdesc equivalents, convert various page table functions to use ptdescs.
-Acked-by: Guo Ren <guoren@kernel.org>
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
+late_alloc() also uses the __get_free_pages() helper function. Convert
+this to use ptdesc_alloc() and ptdesc_address() instead to help
+standardize page tables further.
+
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
- arch/csky/include/asm/pgalloc.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ arch/arm/include/asm/tlb.h | 12 +++++++-----
+ arch/arm/mm/mmu.c | 6 +++---
+ 2 files changed, 10 insertions(+), 8 deletions(-)
-diff --git a/arch/csky/include/asm/pgalloc.h b/arch/csky/include/asm/pgalloc.h
-index 7d57e5da0914..9c84c9012e53 100644
---- a/arch/csky/include/asm/pgalloc.h
-+++ b/arch/csky/include/asm/pgalloc.h
-@@ -63,8 +63,8 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
+diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
+index b8cbe03ad260..9ab8a6929d35 100644
+--- a/arch/arm/include/asm/tlb.h
++++ b/arch/arm/include/asm/tlb.h
+@@ -39,7 +39,9 @@ static inline void __tlb_remove_table(void *_table)
+ static inline void
+ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr)
+ {
+- pgtable_pte_page_dtor(pte);
++ struct ptdesc *ptdesc = page_ptdesc(pte);
++
++ ptdesc_pte_dtor(ptdesc);
- #define __pte_free_tlb(tlb, pte, address) \
- do { \
-- pgtable_pte_page_dtor(pte); \
-- tlb_remove_page(tlb, pte); \
-+ pagetable_pte_dtor(page_ptdesc(pte)); \
-+ tlb_remove_page_ptdesc(tlb, page_ptdesc(pte)); \
- } while (0)
+ #ifndef CONFIG_ARM_LPAE
+ /*
+@@ -50,17 +52,17 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr)
+ __tlb_adjust_range(tlb, addr - PAGE_SIZE, 2 * PAGE_SIZE);
+ #endif
- extern void pagetable_init(void);
+- tlb_remove_table(tlb, pte);
++ tlb_remove_ptdesc(tlb, ptdesc);
+ }
+
+ static inline void
+ __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr)
+ {
+ #ifdef CONFIG_ARM_LPAE
+- struct page *page = virt_to_page(pmdp);
++ struct ptdesc *ptdesc = virt_to_ptdesc(pmdp);
+
+- pgtable_pmd_page_dtor(page);
+- tlb_remove_table(tlb, page);
++ ptdesc_pmd_dtor(ptdesc);
++ tlb_remove_ptdesc(tlb, ptdesc);
+ #endif
+ }
+
+diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
+index 463fc2a8448f..7add505bd797 100644
+--- a/arch/arm/mm/mmu.c
++++ b/arch/arm/mm/mmu.c
+@@ -737,11 +737,11 @@ static void __init *early_alloc(unsigned long sz)
+
+ static void *__init late_alloc(unsigned long sz)
+ {
+- void *ptr = (void *)__get_free_pages(GFP_PGTABLE_KERNEL, get_order(sz));
++ void *ptdesc = ptdesc_alloc(GFP_PGTABLE_KERNEL, get_order(sz));
+
+- if (!ptr || !pgtable_pte_page_ctor(virt_to_page(ptr)))
++ if (!ptdesc || !ptdesc_pte_ctor(ptdesc))
+ BUG();
+- return ptr;
++ return ptdesc;
+ }
+
+ static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,
--
-2.40.1
+2.39.2