Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: Turn head_compound_mapcount() into folio_entire_mapcount()

Browse Source 
Adjust documentation to be more clear.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-01-18 10:50:48 -05:00
parent e20c41b109
commit 74e8ee4708
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/mm.h
View File

@ -776,21 +776,26 @@ static inline int is_vmalloc_or_module_addr(const void *x)
} }
#endif #endif
static inline int head_compound_mapcount(struct page *head) /*
* How many times the entire folio is mapped as a single unit (eg by a
* PMD or PUD entry). This is probably not what you want, except for
* debugging purposes; look at folio_mapcount() or page_mapcount()
* instead.
*/
static inline int folio_entire_mapcount(struct folio *folio)
{ {
return atomic_read(compound_mapcount_ptr(head)) + 1; VM_BUG_ON_FOLIO(!folio_test_large(folio), folio);
return atomic_read(folio_mapcount_ptr(folio)) + 1;
} }
/* /*
* Mapcount of compound page as a whole, does not include mapped sub-pages. * Mapcount of compound page as a whole, does not include mapped sub-pages.
* *
* Must be called only for compound pages or any their tail sub-pages. * Must be called only for compound pages.
*/ */
static inline int compound_mapcount(struct page *page) static inline int compound_mapcount(struct page *page)
{ {
VM_BUG_ON_PAGE(!PageCompound(page), page); return folio_entire_mapcount(page_folio(page));
page = compound_head(page);
return head_compound_mapcount(page);
} }
/* /*

6
mm/debug.c
View File

@ -48,7 +48,8 @@ const struct trace_print_flags vmaflag_names[] = {
static void __dump_page(struct page *page) static void __dump_page(struct page *page)
{ {
struct page *head = compound_head(page); struct folio *folio = page_folio(page);
struct page *head = &folio->page;
struct address_space *mapping; struct address_space *mapping;
bool compound = PageCompound(page); bool compound = PageCompound(page);
/* /*
@ -76,6 +77,7 @@ static void __dump_page(struct page *page)
else else
mapping = (void *)(tmp & ~PAGE_MAPPING_FLAGS); mapping = (void *)(tmp & ~PAGE_MAPPING_FLAGS);
head = page; head = page;
folio = (struct folio *)page;
compound = false; compound = false;
} else { } else {
mapping = page_mapping(page); mapping = page_mapping(page);
@ -94,7 +96,7 @@ static void __dump_page(struct page *page)
if (compound) { if (compound) {
pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n", pr_warn("head:%p order:%u compound_mapcount:%d compound_pincount:%d\n",
head, compound_order(head), head, compound_order(head),
head_compound_mapcount(head), folio_entire_mapcount(folio),
head_compound_pincount(head)); head_compound_pincount(head));
} }