[v6,05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc()

Message ID	20230627031431.29653-6-vishal.moola@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org> 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> Subject: [PATCH v6 05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc() Date: Mon, 26 Jun 2023 20:14:03 -0700 Message-Id: <20230627031431.29653-6-vishal.moola@gmail.com> In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com> References: <20230627031431.29653-1-vishal.moola@gmail.com> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
Series	Split ptdesc from struct page \| expand [v6,00/33] Split ptdesc from struct page [v6,01/33] mm: Add PAGE_TYPE_OP folio functions [v6,02/33] s390: Use _pt_s390_gaddr for gmap address tracking [v6,03/33] pgtable: Create struct ptdesc [v6,04/33] mm: add utility functions for ptdesc [v6,05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc() [v6,06/33] mm: Convert ptlock_alloc() to use ptdescs [v6,07/33] mm: Convert ptlock_ptr() to use ptdescs [v6,08/33] mm: Convert pmd_ptlock_init() to use ptdescs [v6,09/33] mm: Convert ptlock_init() to use ptdescs [v6,10/33] mm: Convert pmd_ptlock_free() to use ptdescs [v6,11/33] mm: Convert ptlock_free() to use ptdescs [v6,12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} [v6,13/33] powerpc: Convert various functions to use ptdescs [v6,14/33] x86: Convert various functions to use ptdescs [v6,15/33] s390: Convert various gmap functions to use ptdescs [v6,16/33] s390: Convert various pgalloc functions to use ptdescs [v6,17/33] mm: Remove page table members from struct page [v6,18/33] pgalloc: Convert various functions to use ptdescs [v6,19/33] arm: Convert various functions to use ptdescs [v6,20/33] arm64: Convert various functions to use ptdescs [v6,21/33] csky: Convert __pte_free_tlb() to use ptdescs [v6,22/33] hexagon: Convert __pte_free_tlb() to use ptdescs [v6,23/33] loongarch: Convert various functions to use ptdescs [v6,24/33] m68k: Convert various functions to use ptdescs [v6,25/33] mips: Convert various functions to use ptdescs [v6,26/33] nios2: Convert __pte_free_tlb() to use ptdescs [v6,27/33] openrisc: Convert __pte_free_tlb() to use ptdescs [v6,28/33] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs [v6,29/33] sh: Convert pte_free_tlb() to use ptdescs [v6,30/33] sparc64: Convert various functions to use ptdescs [v6,31/33] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents [v6,32/33] um: Convert {pmd, pte}_free_tlb() to use ptdescs [v6,33/33] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers

Message ID

20230627031431.29653-6-vishal.moola@gmail.com (mailing list archive)

State

Superseded

Headers

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>
Subject: [PATCH v6 05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc()
Date: Mon, 26 Jun 2023 20:14:03 -0700
Message-Id: <20230627031431.29653-6-vishal.moola@gmail.com>
In-Reply-To: <20230627031431.29653-1-vishal.moola@gmail.com>
References: <20230627031431.29653-1-vishal.moola@gmail.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org>
Errors-To: 
 linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org

Series

Split ptdesc from struct page | expand

Context	Check	Description
conchuod/tree_selection	fail	Failed to apply to next/pending-fixes, riscv/for-next or riscv/master

Context

Check

Description

conchuod/tree_selection

fail

Failed to apply to next/pending-fixes, riscv/for-next or riscv/master

Commit Message

Vishal Moola (Oracle) June 27, 2023, 3:14 a.m. UTC

Converts pmd_pgtable_page() to pmd_ptdesc() and all its callers. This
removes some direct accesses to struct page, working towards splitting
out struct ptdesc from struct page.

Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 include/linux/mm.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 14d95d494958..1511faf0263c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2915,15 +2915,15 @@  pte_t *pte_offset_map_nolock(struct mm_struct *mm, pmd_t *pmd,
 
 #if USE_SPLIT_PMD_PTLOCKS
 
-static inline struct page *pmd_pgtable_page(pmd_t *pmd)
+static inline struct ptdesc *pmd_ptdesc(pmd_t *pmd)
 {
 	unsigned long mask = ~(PTRS_PER_PMD * sizeof(pmd_t) - 1);
-	return virt_to_page((void *)((unsigned long) pmd & mask));
+	return virt_to_ptdesc((void *)((unsigned long) pmd & mask));
 }
 
 static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd)
 {
-	return ptlock_ptr(pmd_pgtable_page(pmd));
+	return ptlock_ptr(ptdesc_page(pmd_ptdesc(pmd)));
 }
 
 static inline bool pmd_ptlock_init(struct page *page)
@@ -2942,7 +2942,7 @@  static inline void pmd_ptlock_free(struct page *page)
 	ptlock_free(page);
 }
 
-#define pmd_huge_pte(mm, pmd) (pmd_pgtable_page(pmd)->pmd_huge_pte)
+#define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte)
 
 #else

[v6,05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc()

Checks

Commit Message

Patch