github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ptdesc: remove references to folios from __pagetable_ctor() and pagetable_dtor()

Browse Source 
In preparation for splitting struct ptdesc from struct page and struct
folio, remove mentions of struct folio from these functions.  Introduce
ptdesc_nr_pages() to avoid using lruvec_stat_add/sub_folio()

Link: https://lkml.kernel.org/r/20250908171104.2409217-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2025-09-08 18:11:01 +01:00 committed by Andrew Morton
parent 522abd9227
commit f0c92726e8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/linux/mm.h
View File

@ -2097,9 +2097,9 @@ static inline long folio_nr_pages(const struct folio *folio)
* page. compound_nr() can be called on a tail page, and is defined to * page. compound_nr() can be called on a tail page, and is defined to
* return 1 in that case. * return 1 in that case.
*/ */
static inline long compound_nr(struct page *page) static inline long compound_nr(const struct page *page)
{ {
struct folio *folio = (struct folio *)page; const struct folio *folio = (struct folio *)page;
if (!test_bit(PG_head, &folio->flags.f)) if (!test_bit(PG_head, &folio->flags.f))
return 1; return 1;
@ -3066,21 +3066,26 @@ static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }
static inline void ptlock_free(struct ptdesc *ptdesc) {} static inline void ptlock_free(struct ptdesc *ptdesc) {}
#endif /* defined(CONFIG_SPLIT_PTE_PTLOCKS) */ #endif /* defined(CONFIG_SPLIT_PTE_PTLOCKS) */
static inline unsigned long ptdesc_nr_pages(const struct ptdesc *ptdesc)
{
return compound_nr(ptdesc_page(ptdesc));
}
static inline void __pagetable_ctor(struct ptdesc *ptdesc) static inline void __pagetable_ctor(struct ptdesc *ptdesc)
{ {
struct folio *folio = ptdesc_folio(ptdesc); pg_data_t *pgdat = NODE_DATA(memdesc_nid(ptdesc->pt_flags));
__folio_set_pgtable(folio); __SetPageTable(ptdesc_page(ptdesc));
lruvec_stat_add_folio(folio, NR_PAGETABLE); mod_node_page_state(pgdat, NR_PAGETABLE, ptdesc_nr_pages(ptdesc));
} }
static inline void pagetable_dtor(struct ptdesc *ptdesc) static inline void pagetable_dtor(struct ptdesc *ptdesc)
{ {
struct folio *folio = ptdesc_folio(ptdesc); pg_data_t *pgdat = NODE_DATA(memdesc_nid(ptdesc->pt_flags));
ptlock_free(ptdesc); ptlock_free(ptdesc);
__folio_clear_pgtable(folio); __ClearPageTable(ptdesc_page(ptdesc));
lruvec_stat_sub_folio(folio, NR_PAGETABLE); mod_node_page_state(pgdat, NR_PAGETABLE, -ptdesc_nr_pages(ptdesc));
} }
static inline void pagetable_dtor_free(struct ptdesc *ptdesc) static inline void pagetable_dtor_free(struct ptdesc *ptdesc)