mips-convert-various-functions-to-use-ptdescs.patch removed from -mm tree
The quilt patch titled
Subject: mips: convert various functions to use ptdescs
has been removed from the -mm tree. Its filename was
mips-convert-various-functions-to-use-ptdescs.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Vishal Moola (Oracle)" <[email protected]>
Subject: mips: convert various functions to use ptdescs
Date: Mon, 7 Aug 2023 16:05:05 -0700
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.
---
arch/mips/include/asm/pgalloc.h | 32 ++++++++++++++++-------------- arch/mips/mm/pgtable.c | 8 ++++--- 2 files changed, 23 insertions(+), 17 deletions(-)
arch/mips/include/asm/pgalloc.h renamed from arch/mips/include/asm/pgalloc.h~mips-convert-various-functions-to-use-ptdescs +18 -14
@@ -51,13 +51,13 @@ extern pgd_t *pgd_alloc(struct mm_structstatic inline void pgd_free (struct mm_struct *mm,pgd_t *pgd) { -free_pages ((unsigned long )pgd,PGD_TABLE_ORDER ); +pagetable_free (virt_to_ptdesc (pgd)); } -#define __pte_free_tlb (tlb,pte,address) \ -do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), pte); \ +#define __pte_free_tlb (tlb, pte, address) \ +do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte)); \ } while (0)#ifndef __PAGETABLE_PMD_FOLDED
@@ -65,18 +65,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_pages (GFP_KERNEL_ACCOUNT ,PMD_TABLE_ORDER ); -if (!pg) + ptdesc =pagetable_alloc (GFP_KERNEL_ACCOUNT ,PMD_TABLE_ORDER ); +if (!ptdesc)return NULL ; -if (!pgtable_pmd_page_ctor (pg)) { -__free_pages (pg,PMD_TABLE_ORDER ); +if (!pagetable_pmd_ctor (ptdesc)) { +pagetable_free (ptdesc);return NULL ; } - pmd = (pmd_t *)page_address (pg); + pmd =ptdesc_address (ptdesc);pmd_init (pmd);return pmd; }
@@ -90,10 +90,14 @@ static inline pmd_t *pmd_alloc_one(strucstatic inline pud_t *pud_alloc_one (struct mm_struct *mm,unsigned long address) {pud_t *pud; +struct ptdesc *ptdesc =pagetable_alloc (GFP_KERNEL & ~__GFP_HIGHMEM, +PUD_TABLE_ORDER ); - pud = (pud_t *)__get_free_pages (GFP_KERNEL ,PUD_TABLE_ORDER ); -if (pud) -pud_init (pud); +if (!ptdesc) +return NULL ; + pud =ptdesc_address (ptdesc); + +pud_init (pud);return pud; }
arch/mips/mm/pgtable.c renamed from arch/mips/mm/pgtable.c~mips-convert-various-functions-to-use-ptdescs +5 -3
@@ -10,10 +10,12 @@pgd_t *pgd_alloc (struct mm_struct *mm) { -pgd_t *ret, *init; +pgd_t *init, *ret =NULL ; +struct ptdesc *ptdesc =pagetable_alloc (GFP_KERNEL & ~__GFP_HIGHMEM, +PGD_TABLE_ORDER ); - ret = (pgd_t *)__get_free_pages (GFP_KERNEL ,PGD_TABLE_ORDER ); -if (ret) { +if (ptdesc) { + ret =ptdesc_address (ptdesc); init =pgd_offset (&init_mm,0UL );pgd_init (ret); memcpy(ret + USER_PTRS_PER_PGD, init + USER_PTRS_PER_PGD,
_
Patches currently in -mm which might be from [email protected] are