stuartl/linux-stable
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git synced 2025-09-15 11:28:36 +10:00
Code Issues Releases Wiki Activity

pgalloc: convert various functions to use ptdescs

Browse Source 
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.

Link: https://lkml.kernel.org/r/20230807230513.102486-17-vishal.moola@gmail.com
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Guo Ren <guoren@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Vishal Moola (Oracle) 2023-08-07 16:04:58 -07:00 committed by Andrew Morton
parent 4f054c28f4
commit c787ae5b39
1 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
include/asm-generic/pgalloc.h
View File

@ -8,7 +8,7 @@
#define GFP_PGTABLE_USER (GFP_PGTABLE_KERNEL | __GFP_ACCOUNT) #define GFP_PGTABLE_USER (GFP_PGTABLE_KERNEL | __GFP_ACCOUNT)
/** /**
* __pte_alloc_one_kernel - allocate a page for PTE-level kernel page table * __pte_alloc_one_kernel - allocate memory for a PTE-level kernel page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* *
* This function is intended for architectures that need * This function is intended for architectures that need
@ -18,12 +18,17 @@
*/ */
static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm) static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm)
{ {
return (pte_t *)__get_free_page(GFP_PGTABLE_KERNEL); struct ptdesc *ptdesc = pagetable_alloc(GFP_PGTABLE_KERNEL &
~__GFP_HIGHMEM, 0);
if (!ptdesc)
return NULL;
return ptdesc_address(ptdesc);
} }
#ifndef __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL #ifndef __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL
/** /**
* pte_alloc_one_kernel - allocate a page for PTE-level kernel page table * pte_alloc_one_kernel - allocate memory for a PTE-level kernel page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* *
* Return: pointer to the allocated memory or %NULL on error * Return: pointer to the allocated memory or %NULL on error
@ -35,40 +40,40 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
#endif #endif
/** /**
* pte_free_kernel - free PTE-level kernel page table page * pte_free_kernel - free PTE-level kernel page table memory
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* @pte: pointer to the memory containing the page table * @pte: pointer to the memory containing the page table
*/ */
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); pagetable_free(virt_to_ptdesc(pte));
} }
/** /**
* __pte_alloc_one - allocate a page for PTE-level user page table * __pte_alloc_one - allocate memory for a PTE-level user page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* @gfp: GFP flags to use for the allocation * @gfp: GFP flags to use for the allocation
* *
* Allocates a page and runs the pgtable_pte_page_ctor(). * Allocate memory for a page table and ptdesc and runs pagetable_pte_ctor().
* *
* This function is intended for architectures that need * This function is intended for architectures that need
* anything beyond simple page allocation or must have custom GFP flags. * anything beyond simple page allocation or must have custom GFP flags.
* *
* Return: `struct page` initialized as page table or %NULL on error * Return: `struct page` referencing the ptdesc or %NULL on error
*/ */
static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp) static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp)
{ {
struct page *pte; struct ptdesc *ptdesc;
pte = alloc_page(gfp); ptdesc = pagetable_alloc(gfp, 0);
if (!pte) if (!ptdesc)
return NULL; return NULL;
if (!pgtable_pte_page_ctor(pte)) { if (!pagetable_pte_ctor(ptdesc)) {
__free_page(pte); pagetable_free(ptdesc);
return NULL; return NULL;
} }
return pte; return ptdesc_page(ptdesc);
} }
#ifndef __HAVE_ARCH_PTE_ALLOC_ONE #ifndef __HAVE_ARCH_PTE_ALLOC_ONE
@ -76,9 +81,9 @@ static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp)
* pte_alloc_one - allocate a page for PTE-level user page table * pte_alloc_one - allocate a page for PTE-level user page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* *
* Allocates a page and runs the pgtable_pte_page_ctor(). * Allocate memory for a page table and ptdesc and runs pagetable_pte_ctor().
* *
* Return: `struct page` initialized as page table or %NULL on error * Return: `struct page` referencing the ptdesc or %NULL on error
*/ */
static inline pgtable_t pte_alloc_one(struct mm_struct *mm) static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
{ {
@ -92,14 +97,16 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
*/ */
/** /**
* pte_free - free PTE-level user page table page * pte_free - free PTE-level user page table memory
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* @pte_page: the `struct page` representing the page table * @pte_page: the `struct page` referencing the ptdesc
*/ */
static inline void pte_free(struct mm_struct *mm, struct page *pte_page) static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
{ {
pgtable_pte_page_dtor(pte_page); struct ptdesc *ptdesc = page_ptdesc(pte_page);
__free_page(pte_page);
pagetable_pte_dtor(ptdesc);
pagetable_free(ptdesc);
} }
@ -107,10 +114,11 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
#ifndef __HAVE_ARCH_PMD_ALLOC_ONE #ifndef __HAVE_ARCH_PMD_ALLOC_ONE
/** /**
* pmd_alloc_one - allocate a page for PMD-level page table * pmd_alloc_one - allocate memory for a PMD-level page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* *
* Allocates a page and runs the pgtable_pmd_page_ctor(). * Allocate memory for a page table and ptdesc and runs pagetable_pmd_ctor().
*
* Allocations use %GFP_PGTABLE_USER in user context and * Allocations use %GFP_PGTABLE_USER in user context and
* %GFP_PGTABLE_KERNEL in kernel context. * %GFP_PGTABLE_KERNEL in kernel context.
* *
@ -118,28 +126,30 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
*/ */
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
{ {
struct page *page; struct ptdesc *ptdesc;
gfp_t gfp = GFP_PGTABLE_USER; gfp_t gfp = GFP_PGTABLE_USER;
if (mm == &init_mm) if (mm == &init_mm)
gfp = GFP_PGTABLE_KERNEL; gfp = GFP_PGTABLE_KERNEL;
page = alloc_page(gfp); ptdesc = pagetable_alloc(gfp, 0);
if (!page) if (!ptdesc)
return NULL; return NULL;
if (!pgtable_pmd_page_ctor(page)) { if (!pagetable_pmd_ctor(ptdesc)) {
__free_page(page); pagetable_free(ptdesc);
return NULL; return NULL;
} }
return (pmd_t *)page_address(page); return ptdesc_address(ptdesc);
} }
#endif #endif
#ifndef __HAVE_ARCH_PMD_FREE #ifndef __HAVE_ARCH_PMD_FREE
static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
struct ptdesc *ptdesc = virt_to_ptdesc(pmd);
BUG_ON((unsigned long)pmd & (PAGE_SIZE-1)); BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
pgtable_pmd_page_dtor(virt_to_page(pmd)); pagetable_pmd_dtor(ptdesc);
free_page((unsigned long)pmd); pagetable_free(ptdesc);
} }
#endif #endif
@ -150,19 +160,25 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
static inline pud_t *__pud_alloc_one(struct mm_struct *mm, unsigned long addr) static inline pud_t *__pud_alloc_one(struct mm_struct *mm, unsigned long addr)
{ {
gfp_t gfp = GFP_PGTABLE_USER; gfp_t gfp = GFP_PGTABLE_USER;
struct ptdesc *ptdesc;
if (mm == &init_mm) if (mm == &init_mm)
gfp = GFP_PGTABLE_KERNEL; gfp = GFP_PGTABLE_KERNEL;
return (pud_t *)get_zeroed_page(gfp); gfp &= ~__GFP_HIGHMEM;
ptdesc = pagetable_alloc(gfp, 0);
if (!ptdesc)
return NULL;
return ptdesc_address(ptdesc);
} }
#ifndef __HAVE_ARCH_PUD_ALLOC_ONE #ifndef __HAVE_ARCH_PUD_ALLOC_ONE
/** /**
* pud_alloc_one - allocate a page for PUD-level page table * pud_alloc_one - allocate memory for a PUD-level page table
* @mm: the mm_struct of the current context * @mm: the mm_struct of the current context
* *
* Allocates a page using %GFP_PGTABLE_USER for user context and * Allocate memory for a page table using %GFP_PGTABLE_USER for user context
* %GFP_PGTABLE_KERNEL for kernel context. * and %GFP_PGTABLE_KERNEL for kernel context.
* *
* Return: pointer to the allocated memory or %NULL on error * Return: pointer to the allocated memory or %NULL on error
*/ */
@ -175,7 +191,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
static inline void __pud_free(struct mm_struct *mm, pud_t *pud) static inline void __pud_free(struct mm_struct *mm, pud_t *pud)
{ {
BUG_ON((unsigned long)pud & (PAGE_SIZE-1)); BUG_ON((unsigned long)pud & (PAGE_SIZE-1));
free_page((unsigned long)pud); pagetable_free(virt_to_ptdesc(pud));
} }
#ifndef __HAVE_ARCH_PUD_FREE #ifndef __HAVE_ARCH_PUD_FREE
@ -190,7 +206,7 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)
#ifndef __HAVE_ARCH_PGD_FREE #ifndef __HAVE_ARCH_PGD_FREE
static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long)pgd); pagetable_free(virt_to_ptdesc(pgd));
} }
#endif #endif