--- v3
+++ v9
@@ -1,94 +1,32 @@
-As part of the conversions to replace pgtable constructor/destructors with
-ptdesc equivalents, convert various page table functions to use ptdescs.
+Part of the conversions to replace pgtable constructor/destructors with
+ptdesc equivalents.
-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.
-
+Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
+Acked-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
- arch/loongarch/include/asm/pgalloc.h | 27 +++++++++++++++------------
- arch/loongarch/mm/pgtable.c | 7 ++++---
- 2 files changed, 19 insertions(+), 15 deletions(-)
+ arch/nios2/include/asm/pgalloc.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch/include/asm/pgalloc.h
-index af1d1e4a6965..5f5afbf1f10c 100644
---- a/arch/loongarch/include/asm/pgalloc.h
-+++ b/arch/loongarch/include/asm/pgalloc.h
-@@ -45,9 +45,9 @@ extern void pagetable_init(void);
+diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h
+index ecd1657bb2ce..ce6bb8e74271 100644
+--- a/arch/nios2/include/asm/pgalloc.h
++++ b/arch/nios2/include/asm/pgalloc.h
+@@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
+
extern pgd_t *pgd_alloc(struct mm_struct *mm);
- #define __pte_free_tlb(tlb, pte, address) \
--do { \
-- pgtable_pte_page_dtor(pte); \
-- tlb_remove_page((tlb), pte); \
-+do { \
-+ pagetable_pte_dtor(page_ptdesc(pte)); \
-+ tlb_remove_page_ptdesc((tlb), page_ptdesc(pte)); \
- } while (0)
+-#define __pte_free_tlb(tlb, pte, addr) \
+- do { \
+- pgtable_pte_page_dtor(pte); \
+- tlb_remove_page((tlb), (pte)); \
++#define __pte_free_tlb(tlb, pte, addr) \
++ do { \
++ pagetable_pte_dtor(page_ptdesc(pte)); \
++ tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \
+ } while (0)
- #ifndef __PAGETABLE_PMD_FOLDED
-@@ -55,18 +55,18 @@ do { \
- static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
- {
- pmd_t *pmd;
-- struct page *pg;
-+ struct ptdesc *ptdesc;
-
-- pg = alloc_page(GFP_KERNEL_ACCOUNT);
-- if (!pg)
-+ ptdesc = pagetable_alloc(GFP_KERNEL_ACCOUNT, 0);
-+ if (!ptdesc)
- return NULL;
-
-- if (!pgtable_pmd_page_ctor(pg)) {
-- __free_page(pg);
-+ if (!pagetable_pmd_ctor(ptdesc)) {
-+ pagetable_free(ptdesc);
- return NULL;
- }
-
-- pmd = (pmd_t *)page_address(pg);
-+ pmd = (pmd_t *)ptdesc_address(ptdesc);
- pmd_init(pmd);
- return pmd;
- }
-@@ -80,10 +80,13 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
- static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
- {
- pud_t *pud;
-+ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);
-
-- pud = (pud_t *) __get_free_page(GFP_KERNEL);
-- if (pud)
-- pud_init(pud);
-+ if (!ptdesc)
-+ return NULL;
-+ pud = (pud_t *)ptdesc_address(ptdesc);
-+
-+ pud_init(pud);
- return pud;
- }
-
-diff --git a/arch/loongarch/mm/pgtable.c b/arch/loongarch/mm/pgtable.c
-index 36a6dc0148ae..cdba10ffc0df 100644
---- a/arch/loongarch/mm/pgtable.c
-+++ b/arch/loongarch/mm/pgtable.c
-@@ -11,10 +11,11 @@
-
- pgd_t *pgd_alloc(struct mm_struct *mm)
- {
-- pgd_t *ret, *init;
-+ pgd_t *init, *ret = NULL;
-+ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL, 0);
-
-- ret = (pgd_t *) __get_free_page(GFP_KERNEL);
-- if (ret) {
-+ if (ptdesc) {
-+ ret = (pgd_t *)ptdesc_address(ptdesc);
- init = pgd_offset(&init_mm, 0UL);
- pgd_init(ret);
- memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,
+ #endif /* _ASM_NIOS2_PGALLOC_H */
--
2.40.1