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>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v3 25/34] m68k: Convert various functions to use ptdescs
Date: Wed, 31 May 2023 14:30:23 -0700 [thread overview]
Message-ID: <20230531213032.25338-26-vishal.moola@gmail.com> (raw)
In-Reply-To: <20230531213032.25338-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 pagetable_alloc() and ptdesc_address() instead to help
standardize page tables further.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
arch/m68k/include/asm/mcf_pgalloc.h | 41 ++++++++++++++--------------
arch/m68k/include/asm/sun3_pgalloc.h | 8 +++---
arch/m68k/mm/motorola.c | 4 +--
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h
index 5c2c0a864524..9eb4ef9e6d77 100644
--- a/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/arch/m68k/include/asm/mcf_pgalloc.h
@@ -7,20 +7,19 @@
extern inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{
- free_page((unsigned long) pte);
+ pagetable_free(virt_to_ptdesc(pte));
}
extern const char bad_pmd_string[];
extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
{
- unsigned long page = __get_free_page(GFP_DMA);
+ struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | __GFP_ZERO, 0);
- if (!page)
+ if (!ptdesc)
return NULL;
- memset((void *)page, 0, PAGE_SIZE);
- return (pte_t *) (page);
+ return (pte_t *) (ptdesc_address(ptdesc));
}
extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
@@ -35,36 +34,36 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pgtable,
unsigned long address)
{
- struct page *page = virt_to_page(pgtable);
+ struct ptdesc *ptdesc = virt_to_ptdesc(pgtable);
- pgtable_pte_page_dtor(page);
- __free_page(page);
+ pagetable_pte_dtor(ptdesc);
+ pagetable_free(ptdesc);
}
static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
{
- struct page *page = alloc_pages(GFP_DMA, 0);
+ struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA, 0);
pte_t *pte;
- if (!page)
+ if (!ptdesc)
return NULL;
- if (!pgtable_pte_page_ctor(page)) {
- __free_page(page);
+ if (!pagetable_pte_ctor(ptdesc)) {
+ pagetable_free(ptdesc);
return NULL;
}
- pte = page_address(page);
- clear_page(pte);
+ pte = ptdesc_address(ptdesc);
+ pagetable_clear(pte);
return pte;
}
static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
{
- struct page *page = virt_to_page(pgtable);
+ struct ptdesc *ptdesc = virt_to_ptdesc(ptdesc);
- pgtable_pte_page_dtor(page);
- __free_page(page);
+ pagetable_pte_dtor(ptdesc);
+ pagetable_free(ptdesc);
}
/*
@@ -75,16 +74,18 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{
- free_page((unsigned long) pgd);
+ pagetable_free(virt_to_ptdesc(pgd));
}
static inline pgd_t *pgd_alloc(struct mm_struct *mm)
{
pgd_t *new_pgd;
+ struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | GFP_NOWARN, 0);
- new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);
- if (!new_pgd)
+ if (!ptdesc)
return NULL;
+ new_pgd = (pgd_t *) ptdesc_address(ptdesc);
+
memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
return new_pgd;
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h
index 198036aff519..ff48573db2c0 100644
--- a/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/arch/m68k/include/asm/sun3_pgalloc.h
@@ -17,10 +17,10 @@
extern const char bad_pmd_string[];
-#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)
static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index c75984e2d86b..594575a0780c 100644
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -161,7 +161,7 @@ void *get_pointer_table(int type)
* m68k doesn't have SPLIT_PTE_PTLOCKS for not having
* SMP.
*/
- pgtable_pte_page_ctor(virt_to_page(page));
+ pagetable_pte_ctor(virt_to_ptdesc(page));
}
mmu_page_ctor(page);
@@ -201,7 +201,7 @@ int free_pointer_table(void *table, int type)
list_del(dp);
mmu_page_dtor((void *)page);
if (type == TABLE_PTE)
- pgtable_pte_page_dtor(virt_to_page((void *)page));
+ pagetable_pte_dtor(virt_to_ptdesc((void *)page));
free_page (page);
return 1;
} else if (ptable_list[type].next != dp) {
--
2.40.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-05-31 21:33 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 21:29 [PATCH v3 00/34] Split ptdesc from struct page Vishal Moola (Oracle)
2023-05-31 21:29 ` [PATCH v3 01/34] mm: Add PAGE_TYPE_OP folio functions Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 02/34] s390: Use _pt_s390_gaddr for gmap address tracking Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 03/34] s390: Use pt_frag_refcount for pagetables Vishal Moola (Oracle)
2023-06-01 13:19 ` Gerald Schaefer
2023-06-01 20:43 ` Vishal Moola
2023-05-31 21:30 ` [PATCH v3 04/34] pgtable: Create struct ptdesc Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 05/34] mm: add utility functions for ptdesc Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 06/34] mm: Convert pmd_pgtable_page() to pmd_ptdesc() Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 07/34] mm: Convert ptlock_alloc() to use ptdescs Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 08/34] mm: Convert ptlock_ptr() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 09/34] mm: Convert pmd_ptlock_init() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 10/34] mm: Convert ptlock_init() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 11/34] mm: Convert pmd_ptlock_free() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 12/34] mm: Convert ptlock_free() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 13/34] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 14/34] powerpc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 15/34] x86: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 16/34] s390: Convert various gmap " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 17/34] s390: Convert various pgalloc " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 18/34] mm: Remove page table members from struct page Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 19/34] pgalloc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 20/34] arm: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 21/34] arm64: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 22/34] csky: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-06-01 4:36 ` Guo Ren
2023-05-31 21:30 ` [PATCH v3 23/34] hexagon: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 24/34] loongarch: Convert various functions " Vishal Moola (Oracle)
2023-05-31 21:30 ` Vishal Moola (Oracle) [this message]
2023-06-01 7:40 ` [PATCH v3 25/34] m68k: " Geert Uytterhoeven
2023-06-01 8:20 ` Vishal Moola
2023-06-01 14:18 ` kernel test robot
2023-05-31 21:30 ` [PATCH v3 26/34] mips: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 27/34] nios2: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 28/34] openrisc: " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 29/34] riscv: Convert alloc_{pmd, pte}_late() " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 30/34] sh: Convert pte_free_tlb() " Vishal Moola (Oracle)
2023-06-01 7:20 ` Geert Uytterhoeven
2023-06-01 7:28 ` John Paul Adrian Glaubitz
2023-06-01 7:42 ` Geert Uytterhoeven
2023-06-01 7:46 ` John Paul Adrian Glaubitz
2023-06-01 8:22 ` Vishal Moola
2023-06-08 10:12 ` John Paul Adrian Glaubitz
2023-05-31 21:30 ` [PATCH v3 31/34] sparc64: Convert various functions " Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 32/34] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 33/34] um: Convert {pmd, pte}_free_tlb() to use ptdescs Vishal Moola (Oracle)
2023-05-31 21:30 ` [PATCH v3 34/34] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Vishal Moola (Oracle)
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=20230531213032.25338-26-vishal.moola@gmail.com \
--to=vishal.moola@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=geert@linux-m68k.org \
--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).