Linux-csky Archive mirror
 help / color / mirror / Atom feed
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>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v6 19/33] arm: Convert various functions to use ptdescs
Date: Mon, 26 Jun 2023 20:14:17 -0700	[thread overview]
Message-ID: <20230627031431.29653-20-vishal.moola@gmail.com> (raw)
In-Reply-To: <20230627031431.29653-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.

late_alloc() also uses the __get_free_pages() helper function. Convert
this to use pagetable_alloc() and ptdesc_address() instead to help
standardize page tables further.

Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 arch/arm/include/asm/tlb.h | 12 +++++++-----
 arch/arm/mm/mmu.c          |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index b8cbe03ad260..f40d06ad5d2a 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -39,7 +39,9 @@ static inline void __tlb_remove_table(void *_table)
 static inline void
 __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr)
 {
-	pgtable_pte_page_dtor(pte);
+	struct ptdesc *ptdesc = page_ptdesc(pte);
+
+	pagetable_pte_dtor(ptdesc);
 
 #ifndef CONFIG_ARM_LPAE
 	/*
@@ -50,17 +52,17 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr)
 	__tlb_adjust_range(tlb, addr - PAGE_SIZE, 2 * PAGE_SIZE);
 #endif
 
-	tlb_remove_table(tlb, pte);
+	tlb_remove_ptdesc(tlb, ptdesc);
 }
 
 static inline void
 __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr)
 {
 #ifdef CONFIG_ARM_LPAE
-	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
 }
 
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 13fc4bb5f792..fdeaee30d167 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -737,11 +737,12 @@ static void __init *early_alloc(unsigned long sz)
 
 static void *__init late_alloc(unsigned long sz)
 {
-	void *ptr = (void *)__get_free_pages(GFP_PGTABLE_KERNEL, get_order(sz));
+	void *ptdesc = pagetable_alloc(GFP_PGTABLE_KERNEL & ~__GFP_HIGHMEM,
+			get_order(sz));
 
-	if (!ptr || !pgtable_pte_page_ctor(virt_to_page(ptr)))
+	if (!ptdesc || !pagetable_pte_ctor(ptdesc))
 		BUG();
-	return ptr;
+	return ptdesc_to_virt(ptdesc);
 }
 
 static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,
-- 
2.40.1


  parent reply	other threads:[~2023-06-27  3:19 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-27  3:13 [PATCH v6 00/33] Split ptdesc from struct page Vishal Moola (Oracle)
2023-06-27  3:13 ` [PATCH v6 01/33] mm: Add PAGE_TYPE_OP folio functions Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 02/33] s390: Use _pt_s390_gaddr for gmap address tracking Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 03/33] pgtable: Create struct ptdesc Vishal Moola (Oracle)
2023-06-27 16:07   ` Peter Xu
2023-06-27 17:51     ` Vishal Moola
2023-06-27  3:14 ` [PATCH v6 04/33] mm: add utility functions for ptdesc Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc() Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 06/33] mm: Convert ptlock_alloc() to use ptdescs Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 07/33] mm: Convert ptlock_ptr() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 08/33] mm: Convert pmd_ptlock_init() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 09/33] mm: Convert ptlock_init() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 10/33] mm: Convert pmd_ptlock_free() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 11/33] mm: Convert ptlock_free() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 13/33] powerpc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 14/33] x86: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 15/33] s390: Convert various gmap " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 16/33] s390: Convert various pgalloc " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 17/33] mm: Remove page table members from struct page Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 18/33] pgalloc: Convert various functions to use ptdescs Vishal Moola (Oracle)
2023-06-27  3:14 ` Vishal Moola (Oracle) [this message]
2023-06-27  3:14 ` [PATCH v6 20/33] arm64: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 21/33] csky: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 22/33] hexagon: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 23/33] loongarch: Convert various functions " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 24/33] m68k: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 25/33] mips: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 26/33] nios2: Convert __pte_free_tlb() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 27/33] openrisc: " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 28/33] riscv: Convert alloc_{pmd, pte}_late() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 29/33] sh: Convert pte_free_tlb() " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 30/33] sparc64: Convert various functions " Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 31/33] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 32/33] um: Convert {pmd, pte}_free_tlb() to use ptdescs Vishal Moola (Oracle)
2023-06-27  3:14 ` [PATCH v6 33/33] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers Vishal Moola (Oracle)
2023-06-27  4:44 ` [PATCH v6 00/33] Split ptdesc from struct page Hugh Dickins
2023-06-27  7:14   ` David Hildenbrand
2023-06-27 20:13     ` Hugh Dickins
2023-06-28  7:41       ` David Hildenbrand
2023-06-28 18:51         ` Matthew Wilcox
2023-06-27 15:57   ` Matthew Wilcox
2023-06-27 20:25     ` Hugh Dickins

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=20230627031431.29653-20-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).