--- v8
+++ v3
@@ -1,35 +1,72 @@
-Part of the conversions to replace pgtable pte 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.
+
+Some of the functions use the *get*page*() helper functions. Convert
+these to use pagetable_alloc() and ptdesc_address() instead to help
+standardize page tables further.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
+Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
---
- arch/sparc/mm/srmmu.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ arch/riscv/include/asm/pgalloc.h | 8 ++++----
+ arch/riscv/mm/init.c | 16 ++++++----------
+ 2 files changed, 10 insertions(+), 14 deletions(-)
-diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
-index 13f027afc875..8393faa3e596 100644
---- a/arch/sparc/mm/srmmu.c
-+++ b/arch/sparc/mm/srmmu.c
-@@ -355,7 +355,8 @@ pgtable_t pte_alloc_one(struct mm_struct *mm)
- return NULL;
- page = pfn_to_page(__nocache_pa((unsigned long)ptep) >> PAGE_SHIFT);
- spin_lock(&mm->page_table_lock);
-- if (page_ref_inc_return(page) == 2 && !pgtable_pte_page_ctor(page)) {
-+ if (page_ref_inc_return(page) == 2 &&
-+ !pagetable_pte_ctor(page_ptdesc(page))) {
- page_ref_dec(page);
- ptep = NULL;
- }
-@@ -371,7 +372,7 @@ void pte_free(struct mm_struct *mm, pgtable_t ptep)
- page = pfn_to_page(__nocache_pa((unsigned long)ptep) >> PAGE_SHIFT);
- spin_lock(&mm->page_table_lock);
- if (page_ref_dec_return(page) == 1)
-- pgtable_pte_page_dtor(page);
-+ pagetable_pte_dtor(page_ptdesc(page));
- spin_unlock(&mm->page_table_lock);
+diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h
+index 59dc12b5b7e8..d169a4f41a2e 100644
+--- a/arch/riscv/include/asm/pgalloc.h
++++ b/arch/riscv/include/asm/pgalloc.h
+@@ -153,10 +153,10 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
- srmmu_free_nocache(ptep, SRMMU_PTE_TABLE_SIZE);
+ #endif /* __PAGETABLE_PMD_FOLDED */
+
+-#define __pte_free_tlb(tlb, pte, buf) \
+-do { \
+- pgtable_pte_page_dtor(pte); \
+- tlb_remove_page((tlb), pte); \
++#define __pte_free_tlb(tlb, pte, buf) \
++do { \
++ pagetable_pte_dtor(page_ptdesc(pte)); \
++ tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));\
+ } while (0)
+ #endif /* CONFIG_MMU */
+
+diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
+index 2f7a7c345a6a..2fe6ca1b1f95 100644
+--- a/arch/riscv/mm/init.c
++++ b/arch/riscv/mm/init.c
+@@ -353,12 +353,10 @@ static inline phys_addr_t __init alloc_pte_fixmap(uintptr_t va)
+
+ static phys_addr_t __init alloc_pte_late(uintptr_t va)
+ {
+- unsigned long vaddr;
+-
+- vaddr = __get_free_page(GFP_KERNEL);
+- BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page((void *)vaddr)));
++ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);
+
+- return __pa(vaddr);
++ BUG_ON(!ptdesc || !pagetable_pte_ctor(ptdesc));
++ return __pa((pte_t *)ptdesc_address(ptdesc));
+ }
+
+ static void __init create_pte_mapping(pte_t *ptep,
+@@ -436,12 +434,10 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t va)
+
+ static phys_addr_t __init alloc_pmd_late(uintptr_t va)
+ {
+- unsigned long vaddr;
+-
+- vaddr = __get_free_page(GFP_KERNEL);
+- BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page((void *)vaddr)));
++ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);
+
+- return __pa(vaddr);
++ BUG_ON(!ptdesc || !pagetable_pmd_ctor(ptdesc));
++ return __pa((pmd_t *)ptdesc_address(ptdesc));
+ }
+
+ static void __init create_pmd_mapping(pmd_t *pmdp,
--
2.40.1