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, Hugh Dickins <hughd@google.com>,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>,
Mike Rapoport <rppt@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>
Subject: [PATCH mm-unstable v8 18/31] arm64: Convert various functions to use ptdescs
Date: Mon, 31 Jul 2023 10:03:19 -0700 [thread overview]
Message-ID: <20230731170332.69404-19-vishal.moola@gmail.com> (raw)
In-Reply-To: <20230731170332.69404-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.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/asm/tlb.h | 14 ++++++++------
arch/arm64/mm/mmu.c | 7 ++++---
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h
index c995d1f4594f..2c29239d05c3 100644
--- a/arch/arm64/include/asm/tlb.h
+++ b/arch/arm64/include/asm/tlb.h
@@ -75,18 +75,20 @@ static inline void tlb_flush(struct mmu_gather *tlb)
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
unsigned long addr)
{
- pgtable_pte_page_dtor(pte);
- tlb_remove_table(tlb, pte);
+ struct ptdesc *ptdesc = page_ptdesc(pte);
+
+ pagetable_pte_dtor(ptdesc);
+ tlb_remove_ptdesc(tlb, ptdesc);
}
#if CONFIG_PGTABLE_LEVELS > 2
static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,
unsigned long addr)
{
- struct page *page = virt_to_page(pmdp);
+ struct ptdesc *ptdesc = virt_to_ptdesc(pmdp);
- pgtable_pmd_page_dtor(page);
- tlb_remove_table(tlb, page);
+ pagetable_pmd_dtor(ptdesc);
+ tlb_remove_ptdesc(tlb, ptdesc);
}
#endif
@@ -94,7 +96,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp,
static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pudp,
unsigned long addr)
{
- tlb_remove_table(tlb, virt_to_page(pudp));
+ tlb_remove_ptdesc(tlb, virt_to_ptdesc(pudp));
}
#endif
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 95d360805f8a..47781bec6171 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -426,6 +426,7 @@ static phys_addr_t __pgd_pgtable_alloc(int shift)
static phys_addr_t pgd_pgtable_alloc(int shift)
{
phys_addr_t pa = __pgd_pgtable_alloc(shift);
+ struct ptdesc *ptdesc = page_ptdesc(phys_to_page(pa));
/*
* Call proper page table ctor in case later we need to
@@ -433,12 +434,12 @@ static phys_addr_t pgd_pgtable_alloc(int shift)
* this pre-allocated page table.
*
* We don't select ARCH_ENABLE_SPLIT_PMD_PTLOCK if pmd is
- * folded, and if so pgtable_pmd_page_ctor() becomes nop.
+ * folded, and if so pagetable_pte_ctor() becomes nop.
*/
if (shift == PAGE_SHIFT)
- BUG_ON(!pgtable_pte_page_ctor(phys_to_page(pa)));
+ BUG_ON(!pagetable_pte_ctor(ptdesc));
else if (shift == PMD_SHIFT)
- BUG_ON(!pgtable_pmd_page_ctor(phys_to_page(pa)));
+ BUG_ON(!pagetable_pmd_ctor(ptdesc));
return pa;
}
--
2.40.1
next prev parent reply other threads:[~2023-07-31 17:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 17:03 [PATCH mm-unstable v8 00/31] Split ptdesc from struct page Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 01/31] mm: Add PAGE_TYPE_OP folio functions Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 02/31] pgtable: Create struct ptdesc Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 03/31] mm: add utility functions for ptdesc Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 04/31] mm: Convert pmd_pgtable_page() callers to use pmd_ptdesc() Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 05/31] mm: Convert ptlock_alloc() to use ptdescs Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 06/31] mm: Convert ptlock_ptr() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 07/31] mm: Convert pmd_ptlock_init() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 08/31] mm: Convert ptlock_init() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 09/31] mm: Convert pmd_ptlock_free() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 10/31] mm: Convert ptlock_free() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 11/31] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 12/31] powerpc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 13/31] x86: " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 14/31] s390: Convert various pgalloc " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 15/31] mm: Remove page table members from struct page Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 16/31] pgalloc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 17/31] arm: " Vishal Moola (Oracle)
2023-07-31 17:03 ` Vishal Moola (Oracle) [this message]
2023-07-31 17:03 ` [PATCH mm-unstable v8 19/31] csky: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 20/31] hexagon: " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 21/31] loongarch: Convert various functions " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 22/31] m68k: " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 23/31] mips: " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 24/31] nios2: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 25/31] openrisc: " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 26/31] riscv: Convert alloc_{pmd, pte}_late() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 27/31] sh: Convert pte_free_tlb() " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 28/31] sparc64: Convert various functions " Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 29/31] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 30/31] um: Convert {pmd, pte}_free_tlb() to use ptdescs Vishal Moola (Oracle)
2023-07-31 17:03 ` [PATCH mm-unstable v8 31/31] 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=20230731170332.69404-19-vishal.moola@gmail.com \
--to=vishal.moola@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=hughd@google.com \
--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=rppt@kernel.org \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).