From: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Matthew Wilcox <willy@infradead.org>
Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org,
linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
linux-um@lists.infradead.org, xen-devel@lists.xenproject.org,
kvm@vger.kernel.org,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v2 19/34] pgalloc: Convert various functions to use ptdescs
Date: Mon, 1 May 2023 12:28:14 -0700 [thread overview]
Message-ID: <20230501192829.17086-20-vishal.moola@gmail.com> (raw)
In-Reply-To: <20230501192829.17086-1-vishal.moola@gmail.com>
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 ptdesc_alloc() and ptdesc_address() instead to help
standardize page tables further.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
include/asm-generic/pgalloc.h | 62 +++++++++++++++++++++--------------
1 file changed, 37 insertions(+), 25 deletions(-)
diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h
index a7cf825befae..7d4a1f5d3c17 100644
--- a/include/asm-generic/pgalloc.h
+++ b/include/asm-generic/pgalloc.h
@@ -18,7 +18,11 @@
*/
static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm)
{
- return (pte_t *)__get_free_page(GFP_PGTABLE_KERNEL);
+ struct ptdesc *ptdesc = ptdesc_alloc(GFP_PGTABLE_KERNEL, 0);
+
+ if (!ptdesc)
+ return NULL;
+ return (pte_t *)ptdesc_address(ptdesc);
}
#ifndef __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL
@@ -41,7 +45,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
*/
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{
- free_page((unsigned long)pte);
+ ptdesc_free(virt_to_ptdesc(pte));
}
/**
@@ -49,7 +53,7 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
* @mm: the mm_struct of the current context
* @gfp: GFP flags to use for the allocation
*
- * Allocates a page and runs the pgtable_pte_page_ctor().
+ * Allocates a ptdesc and runs the ptdesc_pte_ctor().
*
* This function is intended for architectures that need
* anything beyond simple page allocation or must have custom GFP flags.
@@ -58,17 +62,17 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
*/
static inline pgtable_t __pte_alloc_one(struct mm_struct *mm, gfp_t gfp)
{
- struct page *pte;
+ struct ptdesc *ptdesc;
- pte = alloc_page(gfp);
- if (!pte)
+ ptdesc = ptdesc_alloc(gfp, 0);
+ if (!ptdesc)
return NULL;
- if (!pgtable_pte_page_ctor(pte)) {
- __free_page(pte);
+ if (!ptdesc_pte_ctor(ptdesc)) {
+ ptdesc_free(ptdesc);
return NULL;
}
- return pte;
+ return ptdesc_page(ptdesc);
}
#ifndef __HAVE_ARCH_PTE_ALLOC_ONE
@@ -76,7 +80,7 @@ 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
* @mm: the mm_struct of the current context
*
- * Allocates a page and runs the pgtable_pte_page_ctor().
+ * Allocates a ptdesc and runs the ptdesc_pte_ctor().
*
* Return: `struct page` initialized as page table or %NULL on error
*/
@@ -98,8 +102,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
*/
static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
{
- pgtable_pte_page_dtor(pte_page);
- __free_page(pte_page);
+ struct ptdesc *ptdesc = page_ptdesc(pte_page);
+
+ ptdesc_pte_dtor(ptdesc);
+ ptdesc_free(ptdesc);
}
@@ -110,7 +116,7 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page)
* pmd_alloc_one - allocate a page for PMD-level page table
* @mm: the mm_struct of the current context
*
- * Allocates a page and runs the pgtable_pmd_page_ctor().
+ * Allocates a ptdesc and runs the ptdesc_pmd_ctor().
* Allocations use %GFP_PGTABLE_USER in user context and
* %GFP_PGTABLE_KERNEL in kernel context.
*
@@ -118,28 +124,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)
{
- struct page *page;
+ struct ptdesc *ptdesc;
gfp_t gfp = GFP_PGTABLE_USER;
if (mm == &init_mm)
gfp = GFP_PGTABLE_KERNEL;
- page = alloc_page(gfp);
- if (!page)
+ ptdesc = ptdesc_alloc(gfp, 0);
+ if (!ptdesc)
return NULL;
- if (!pgtable_pmd_page_ctor(page)) {
- __free_page(page);
+ if (!ptdesc_pmd_ctor(ptdesc)) {
+ ptdesc_free(ptdesc);
return NULL;
}
- return (pmd_t *)page_address(page);
+ return (pmd_t *)ptdesc_address(ptdesc);
}
#endif
#ifndef __HAVE_ARCH_PMD_FREE
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));
- pgtable_pmd_page_dtor(virt_to_page(pmd));
- free_page((unsigned long)pmd);
+ ptdesc_pmd_dtor(ptdesc);
+ ptdesc_free(ptdesc);
}
#endif
@@ -149,11 +157,15 @@ 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)
{
- gfp_t gfp = GFP_PGTABLE_USER;
+ gfp_t gfp = GFP_PGTABLE_USER | __GFP_ZERO;
+ struct ptdesc *ptdesc;
if (mm == &init_mm)
gfp = GFP_PGTABLE_KERNEL;
- return (pud_t *)get_zeroed_page(gfp);
+ ptdesc = ptdesc_alloc(gfp, 0);
+ if (!ptdesc)
+ return NULL;
+ return (pud_t *)ptdesc_address(ptdesc);
}
#ifndef __HAVE_ARCH_PUD_ALLOC_ONE
@@ -175,7 +187,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)
{
BUG_ON((unsigned long)pud & (PAGE_SIZE-1));
- free_page((unsigned long)pud);
+ ptdesc_free(virt_to_ptdesc(pud));
}
#ifndef __HAVE_ARCH_PUD_FREE
@@ -190,7 +202,7 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)
#ifndef __HAVE_ARCH_PGD_FREE
static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
- free_page((unsigned long)pgd);
+ ptdesc_free(virt_to_ptdesc(pgd));
}
#endif
--
2.39.2
next prev parent reply other threads:[~2023-05-01 19:31 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-01 19:27 [PATCH v2 00/34] Split ptdesc from struct page Vishal Moola (Oracle)
2023-05-01 19:27 ` [PATCH v2 01/34] mm: Add PAGE_TYPE_OP folio functions Vishal Moola (Oracle)
2023-05-25 8:55 ` Mike Rapoport
2023-05-25 17:00 ` Vishal Moola
2023-05-25 20:20 ` Mike Rapoport
2023-05-25 20:38 ` Vishal Moola
2023-05-25 20:57 ` Matthew Wilcox
2023-05-01 19:27 ` [PATCH v2 02/34] s390: Use _pt_s390_gaddr for gmap address tracking Vishal Moola (Oracle)
2023-05-25 8:58 ` Mike Rapoport
2023-05-25 17:12 ` Vishal Moola
2023-05-01 19:27 ` [PATCH v2 03/34] s390: Use pt_frag_refcount for pagetables Vishal Moola (Oracle)
2023-05-01 19:27 ` [PATCH v2 04/34] pgtable: Create struct ptdesc Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 05/34] mm: add utility functions for ptdesc Vishal Moola (Oracle)
2023-05-25 9:09 ` Mike Rapoport
2023-05-25 18:04 ` Vishal Moola
2023-05-25 20:25 ` Mike Rapoport
2023-05-25 20:53 ` Vishal Moola
2023-05-27 10:41 ` Mike Rapoport
2023-05-27 15:09 ` Matthew Wilcox
2023-05-28 5:47 ` Mike Rapoport
2023-05-01 19:28 ` [PATCH v2 06/34] mm: Convert pmd_pgtable_page() to pmd_ptdesc() Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 07/34] mm: Convert ptlock_alloc() to use ptdescs Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 08/34] mm: Convert ptlock_ptr() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 09/34] mm: Convert pmd_ptlock_init() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 10/34] mm: Convert ptlock_init() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 11/34] mm: Convert pmd_ptlock_free() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 12/34] mm: Convert ptlock_free() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 13/34] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Vishal Moola (Oracle)
2023-05-25 9:19 ` Mike Rapoport
2023-05-25 18:17 ` Vishal Moola
2023-05-01 19:28 ` [PATCH v2 14/34] powerpc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 15/34] x86: " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 16/34] s390: Convert various gmap " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 17/34] s390: Convert various pgalloc " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 18/34] mm: Remove page table members from struct page Vishal Moola (Oracle)
2023-05-01 19:28 ` Vishal Moola (Oracle) [this message]
2023-05-01 19:28 ` [PATCH v2 20/34] arm: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 21/34] arm64: " Vishal Moola (Oracle)
2023-05-02 1:48 ` kernel test robot
2023-05-02 2:21 ` kernel test robot
2023-05-01 19:28 ` [PATCH v2 22/34] csky: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 23/34] hexagon: " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 24/34] loongarch: Convert various functions " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 25/34] m68k: " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 26/34] mips: " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 27/34] nios2: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 28/34] openrisc: " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 29/34] riscv: Convert alloc_{pmd, pte}_late() " Vishal Moola (Oracle)
2023-05-01 20:59 ` Palmer Dabbelt
2023-05-01 19:28 ` [PATCH v2 30/34] sh: Convert pte_free_tlb() " Vishal Moola (Oracle)
2023-05-06 11:35 ` John Paul Adrian Glaubitz
2023-05-15 19:11 ` Vishal Moola
2023-05-01 19:28 ` [PATCH v2 31/34] sparc64: Convert various functions " Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 32/34] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 33/34] um: Convert {pmd, pte}_free_tlb() to use ptdescs Vishal Moola (Oracle)
2023-05-01 19:28 ` [PATCH v2 34/34] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Vishal Moola (Oracle)
2023-05-18 12:12 ` [PATCH v2 00/34] Split ptdesc from struct page Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230501192829.17086-20-vishal.moola@gmail.com \
--to=vishal.moola@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-openrisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=sparclinux@vger.kernel.org \
--cc=willy@infradead.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).