[v6,11/33] mm: Convert ptlock_free() to use ptdescs

Message ID	20230627031431.29653-12-vishal.moola@gmail.com
State	New
Headers	show Return-Path: <SRS0=Vxgr=CP=vger.kernel.org=sparclinux-owner@ozlabs.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 11/33] mm: Convert ptlock_free() to use ptdescs Date: Mon, 26 Jun 2023 20:14:09 -0700 Message-Id: <20230627031431.29653-12-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 Content-Transfer-Encoding: 8bit Precedence: bulk
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-12-vishal.moola@gmail.com

State

New

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 11/33] mm: Convert ptlock_free() to use ptdescs
Date: Mon, 26 Jun 2023 20:14:09 -0700
Message-Id: <20230627031431.29653-12-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
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Split ptdesc from struct page | expand

Commit Message

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

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 | 10 +++++-----
 mm/memory.c        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0221675e4dc5..69e6d6696c44 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2799,7 +2799,7 @@  static inline void pagetable_free(struct ptdesc *pt)
 #if ALLOC_SPLIT_PTLOCKS
 void __init ptlock_cache_init(void);
 bool ptlock_alloc(struct ptdesc *ptdesc);
-extern void ptlock_free(struct page *page);
+void ptlock_free(struct ptdesc *ptdesc);
 
 static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc)
 {
@@ -2815,7 +2815,7 @@  static inline bool ptlock_alloc(struct ptdesc *ptdesc)
 	return true;
 }
 
-static inline void ptlock_free(struct page *page)
+static inline void ptlock_free(struct ptdesc *ptdesc)
 {
 }
 
@@ -2856,7 +2856,7 @@  static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
 }
 static inline void ptlock_cache_init(void) {}
 static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }
-static inline void ptlock_free(struct page *page) {}
+static inline void ptlock_free(struct ptdesc *ptdesc) {}
 #endif /* USE_SPLIT_PTE_PTLOCKS */
 
 static inline bool pgtable_pte_page_ctor(struct page *page)
@@ -2870,7 +2870,7 @@  static inline bool pgtable_pte_page_ctor(struct page *page)
 
 static inline void pgtable_pte_page_dtor(struct page *page)
 {
-	ptlock_free(page);
+	ptlock_free(page_ptdesc(page));
 	__ClearPageTable(page);
 	dec_lruvec_page_state(page, NR_PAGETABLE);
 }
@@ -2939,7 +2939,7 @@  static inline void pmd_ptlock_free(struct ptdesc *ptdesc)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc));
 #endif
-	ptlock_free(ptdesc_page(ptdesc));
+	ptlock_free(ptdesc);
 }
 
 #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte)
diff --git a/mm/memory.c b/mm/memory.c
index 2ff14f50c7b3..8743aef6095b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5931,8 +5931,8 @@  bool ptlock_alloc(struct ptdesc *ptdesc)
 	return true;
 }
 
-void ptlock_free(struct page *page)
+void ptlock_free(struct ptdesc *ptdesc)
 {
-	kmem_cache_free(page_ptl_cachep, page->ptl);
+	kmem_cache_free(page_ptl_cachep, ptdesc->ptl);
 }
 #endif

[v6,11/33] mm: Convert ptlock_free() to use ptdescs

Commit Message

Patch