From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-mm@kvack.org, Hugh Dickins <hughd@google.com>
Subject: [PATCH 04/22] mm: Convert total_compound_mapcount() to folio_total_mapcount()
Date: Sat, 31 Dec 2022 21:45:52 +0000 [thread overview]
Message-ID: <20221231214610.2800682-5-willy@infradead.org> (raw)
In-Reply-To: <20221231214610.2800682-1-willy@infradead.org>
Instead of enforcing that the argument must be a head page by naming,
enforce it with the compiler by making it a folio. Also rename the
counter in struct folio from _compound_mapcount to _entire_mapcount.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/mm.h | 6 +++---
include/linux/mm_types.h | 6 +++---
mm/rmap.c | 21 ++++++++++-----------
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7ee1938278f5..0079f779da47 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -866,7 +866,7 @@ static inline int page_mapcount(struct page *page)
return head_compound_mapcount(page) + mapcount;
}
-int total_compound_mapcount(struct page *head);
+int folio_total_mapcount(struct folio *folio);
/**
* folio_mapcount() - Calculate the number of mappings of this folio.
@@ -883,14 +883,14 @@ static inline int folio_mapcount(struct folio *folio)
{
if (likely(!folio_test_large(folio)))
return atomic_read(&folio->_mapcount) + 1;
- return total_compound_mapcount(&folio->page);
+ return folio_total_mapcount(folio);
}
static inline int total_mapcount(struct page *page)
{
if (likely(!PageCompound(page)))
return atomic_read(&page->_mapcount) + 1;
- return total_compound_mapcount(compound_head(page));
+ return folio_total_mapcount(page_folio(page));
}
static inline bool folio_large_is_mapped(struct folio *folio)
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index fc44d5bab7b8..15cfb0e24e84 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -306,7 +306,7 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page)
* @_head_1: Points to the folio. Do not use.
* @_folio_dtor: Which destructor to use for this folio.
* @_folio_order: Do not use directly, call folio_order().
- * @_compound_mapcount: Do not use directly, call folio_entire_mapcount().
+ * @_entire_mapcount: Do not use directly, call folio_entire_mapcount().
* @_nr_pages_mapped: Do not use directly, call folio_mapcount().
* @_pincount: Do not use directly, call folio_maybe_dma_pinned().
* @_folio_nr_pages: Do not use directly, call folio_nr_pages().
@@ -360,7 +360,7 @@ struct folio {
unsigned long _head_1;
unsigned char _folio_dtor;
unsigned char _folio_order;
- atomic_t _compound_mapcount;
+ atomic_t _entire_mapcount;
atomic_t _nr_pages_mapped;
atomic_t _pincount;
#ifdef CONFIG_64BIT
@@ -403,7 +403,7 @@ FOLIO_MATCH(flags, _flags_1);
FOLIO_MATCH(compound_head, _head_1);
FOLIO_MATCH(compound_dtor, _folio_dtor);
FOLIO_MATCH(compound_order, _folio_order);
-FOLIO_MATCH(compound_mapcount, _compound_mapcount);
+FOLIO_MATCH(compound_mapcount, _entire_mapcount);
FOLIO_MATCH(subpages_mapcount, _nr_pages_mapped);
FOLIO_MATCH(compound_pincount, _pincount);
#ifdef CONFIG_64BIT
diff --git a/mm/rmap.c b/mm/rmap.c
index 09f4d260a46c..17984eb9f990 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1085,27 +1085,26 @@ int pfn_mkclean_range(unsigned long pfn, unsigned long nr_pages, pgoff_t pgoff,
return page_vma_mkclean_one(&pvmw);
}
-int total_compound_mapcount(struct page *head)
+int folio_total_mapcount(struct folio *folio)
{
- struct folio *folio = (struct folio *)head;
- int mapcount = head_compound_mapcount(head);
- int nr_subpages;
+ int mapcount = folio_entire_mapcount(folio);
+ int nr_pages;
int i;
- /* In the common case, avoid the loop when no subpages mapped by PTE */
+ /* In the common case, avoid the loop when no pages mapped by PTE */
if (folio_nr_pages_mapped(folio) == 0)
return mapcount;
/*
- * Add all the PTE mappings of those subpages mapped by PTE.
- * Limit the loop, knowing that only subpages_mapcount are mapped?
+ * Add all the PTE mappings of those pages mapped by PTE.
+ * Limit the loop to folio_nr_pages_mapped()?
* Perhaps: given all the raciness, that may be a good or a bad idea.
*/
- nr_subpages = thp_nr_pages(head);
- for (i = 0; i < nr_subpages; i++)
- mapcount += atomic_read(&head[i]._mapcount);
+ nr_pages = folio_nr_pages(folio);
+ for (i = 0; i < nr_pages; i++)
+ mapcount += atomic_read(&folio_page(folio, i)->_mapcount);
/* But each of those _mapcounts was based on -1 */
- mapcount += nr_subpages;
+ mapcount += nr_pages;
return mapcount;
}
--
2.35.1
next prev parent reply other threads:[~2022-12-31 21:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-31 21:45 [PATCH 00/22] Get rid of first tail page fields Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 01/22] mm: Remove folio_pincount_ptr() and head_compound_pincount() Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 02/22] mm: Convert head_subpages_mapcount() into folio_nr_pages_mapped() Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 03/22] doc: Clarify refcount section by referring to folios & pages Matthew Wilcox (Oracle)
2022-12-31 21:45 ` Matthew Wilcox (Oracle) [this message]
2022-12-31 21:45 ` [PATCH 05/22] mm: Convert page_remove_rmap() to use a folio internally Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 06/22] mm: Convert page_add_anon_rmap() " Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 07/22] mm: Convert page_add_file_rmap() " Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 08/22] mm: Add folio_add_new_anon_rmap() Matthew Wilcox (Oracle)
2022-12-31 23:29 ` kernel test robot
2022-12-31 23:59 ` kernel test robot
2022-12-31 21:45 ` [PATCH 09/22] page_alloc: Use folio fields directly Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 10/22] mm: Use a folio in hugepage_add_anon_rmap() and hugepage_add_new_anon_rmap() Matthew Wilcox (Oracle)
2022-12-31 21:45 ` [PATCH 11/22] mm: Use entire_mapcount in __page_dup_rmap() Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 12/22] mm/debug: Remove call to head_compound_mapcount() Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 13/22] hugetlb: Remove uses of folio_mapcount_ptr Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 14/22] mm: Convert page_mapcount() to use folio_entire_mapcount() Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 15/22] mm: Remove head_compound_mapcount() and _ptr functions Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 16/22] mm: Reimplement compound_order() Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 17/22] mm: Reimplement compound_nr() Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 18/22] mm: Convert set_compound_page_dtor() and set_compound_order() to folios Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 19/22] mm: Convert is_transparent_hugepage() to use a folio Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 20/22] mm: Convert destroy_large_folio() to use folio_dtor Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 21/22] hugetlb: Remove uses of compound_dtor and compound_nr Matthew Wilcox (Oracle)
2022-12-31 21:46 ` [PATCH 22/22] mm: Remove 'First tail page' members from struct page Matthew Wilcox (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=20221231214610.2800682-5-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=linux-mm@kvack.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 NNTP newsgroup(s).