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 mm-unstable v8 10/31] mm: Convert ptlock_free() to use ptdescs
Date: Mon, 31 Jul 2023 10:03:11 -0700 [thread overview]
Message-ID: <20230731170332.69404-11-vishal.moola@gmail.com> (raw)
In-Reply-To: <20230731170332.69404-1-vishal.moola@gmail.com>
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 774fe83c0c16..ffddae95af78 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2842,7 +2842,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)
{
@@ -2858,7 +2858,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)
{
}
@@ -2899,7 +2899,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)
@@ -2913,7 +2913,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);
}
@@ -2987,7 +2987,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 4fee273595e2..e5e370cdac23 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -6242,8 +6242,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
--
2.40.1
next prev parent reply other threads:[~2023-07-31 17:05 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 ` Vishal Moola (Oracle) [this message]
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 ` [PATCH mm-unstable v8 18/31] arm64: " Vishal Moola (Oracle)
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-11-vishal.moola@gmail.com \
--to=vishal.moola@gmail.com \
--cc=akpm@linux-foundation.org \
--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).