From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-cachefs@redhat.com, linux-afs@lists.infradead.org
Subject: [PATCH v6 08/27] mm: Create FolioFlags
Date: Wed, 31 Mar 2021 19:47:09 +0100 [thread overview]
Message-ID: <20210331184728.1188084-9-willy@infradead.org> (raw)
In-Reply-To: <20210331184728.1188084-1-willy@infradead.org>
These new functions are the folio analogues of the PageFlags functions.
If CONFIG_DEBUG_VM_PGFLAGS is enabled, we check the folio is not a tail
page at every invocation. Note that this will also catch the PagePoisoned
case as a poisoned page has every bit set, which would include PageTail.
This saves 1727 bytes of text with the distro-derived config that
I'm testing due to removing a double call to compound_head() in
PageSwapCache().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/page-flags.h | 130 ++++++++++++++++++++++++++++++-------
1 file changed, 107 insertions(+), 23 deletions(-)
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 04a34c08e0a6..b923a90b3ba5 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -212,6 +212,15 @@ static inline void page_init_poison(struct page *page, size_t size)
}
#endif
+static unsigned long *folio_flags(struct folio *folio, unsigned n)
+{
+ struct page *page = &folio->page;
+
+ VM_BUG_ON_PGFLAGS(PageTail(page), page);
+ VM_BUG_ON_PGFLAGS(n > 0 && !test_bit(PG_head, &page->flags), page);
+ return &page[n].flags;
+}
+
/*
* Page flags policies wrt compound pages
*
@@ -256,34 +265,56 @@ static inline void page_init_poison(struct page *page, size_t size)
VM_BUG_ON_PGFLAGS(!PageHead(page), page); \
PF_POISONED_CHECK(&page[1]); })
+/* Which page is the flag stored in */
+#define FOLIO_PF_ANY 0
+#define FOLIO_PF_HEAD 0
+#define FOLIO_PF_ONLY_HEAD 0
+#define FOLIO_PF_NO_TAIL 0
+#define FOLIO_PF_NO_COMPOUND 0
+#define FOLIO_PF_SECOND 1
+
/*
* Macros to create function definitions for page flags
*/
#define TESTPAGEFLAG(uname, lname, policy) \
+static __always_inline int Folio##uname(struct folio *folio) \
+ { return test_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline int Page##uname(struct page *page) \
{ return test_bit(PG_##lname, &policy(page, 0)->flags); }
#define SETPAGEFLAG(uname, lname, policy) \
+static __always_inline void SetFolio##uname(struct folio *folio) \
+ { set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline void SetPage##uname(struct page *page) \
{ set_bit(PG_##lname, &policy(page, 1)->flags); }
#define CLEARPAGEFLAG(uname, lname, policy) \
+static __always_inline void ClearFolio##uname(struct folio *folio) \
+ { clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline void ClearPage##uname(struct page *page) \
{ clear_bit(PG_##lname, &policy(page, 1)->flags); }
#define __SETPAGEFLAG(uname, lname, policy) \
+static __always_inline void __SetFolio##uname(struct folio *folio) \
+ { __set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline void __SetPage##uname(struct page *page) \
{ __set_bit(PG_##lname, &policy(page, 1)->flags); }
#define __CLEARPAGEFLAG(uname, lname, policy) \
+static __always_inline void __ClearFolio##uname(struct folio *folio) \
+ { __clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline void __ClearPage##uname(struct page *page) \
{ __clear_bit(PG_##lname, &policy(page, 1)->flags); }
#define TESTSETFLAG(uname, lname, policy) \
+static __always_inline int TestSetFolio##uname(struct folio *folio) \
+ { return test_and_set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline int TestSetPage##uname(struct page *page) \
{ return test_and_set_bit(PG_##lname, &policy(page, 1)->flags); }
#define TESTCLEARFLAG(uname, lname, policy) \
+static __always_inline int TestClearFolio##uname(struct folio *folio) \
+ { return test_and_clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
static __always_inline int TestClearPage##uname(struct page *page) \
{ return test_and_clear_bit(PG_##lname, &policy(page, 1)->flags); }
@@ -302,21 +333,27 @@ static __always_inline int TestClearPage##uname(struct page *page) \
TESTCLEARFLAG(uname, lname, policy)
#define TESTPAGEFLAG_FALSE(uname) \
+static inline int Folio##uname(const struct folio *folio) { return 0; } \
static inline int Page##uname(const struct page *page) { return 0; }
#define SETPAGEFLAG_NOOP(uname) \
+static inline void SetFolio##uname(struct folio *folio) { } \
static inline void SetPage##uname(struct page *page) { }
#define CLEARPAGEFLAG_NOOP(uname) \
+static inline void ClearFolio##uname(struct folio *folio) { } \
static inline void ClearPage##uname(struct page *page) { }
#define __CLEARPAGEFLAG_NOOP(uname) \
+static inline void __ClearFolio##uname(struct folio *folio) { } \
static inline void __ClearPage##uname(struct page *page) { }
#define TESTSETFLAG_FALSE(uname) \
+static inline int TestSetFolio##uname(struct folio *folio) { return 0; } \
static inline int TestSetPage##uname(struct page *page) { return 0; }
#define TESTCLEARFLAG_FALSE(uname) \
+static inline int TestClearFolio##uname(struct folio *folio) { return 0; } \
static inline int TestClearPage##uname(struct page *page) { return 0; }
#define PAGEFLAG_FALSE(uname) TESTPAGEFLAG_FALSE(uname) \
@@ -393,14 +430,18 @@ PAGEFLAG_FALSE(HighMem)
#endif
#ifdef CONFIG_SWAP
-static __always_inline int PageSwapCache(struct page *page)
+static __always_inline bool FolioSwapCache(struct folio *folio)
{
-#ifdef CONFIG_THP_SWAP
- page = compound_head(page);
-#endif
- return PageSwapBacked(page) && test_bit(PG_swapcache, &page->flags);
+ return FolioSwapBacked(folio) &&
+ test_bit(PG_swapcache, folio_flags(folio, 0));
}
+
+static __always_inline bool PageSwapCache(struct page *page)
+{
+ return FolioSwapCache(page_folio(page));
+}
+
SETPAGEFLAG(SwapCache, swapcache, PF_NO_TAIL)
CLEARPAGEFLAG(SwapCache, swapcache, PF_NO_TAIL)
#else
@@ -478,10 +519,14 @@ static __always_inline int PageMappingFlags(struct page *page)
return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) != 0;
}
-static __always_inline int PageAnon(struct page *page)
+static __always_inline bool FolioAnon(struct folio *folio)
+{
+ return ((unsigned long)folio->mapping & PAGE_MAPPING_ANON) != 0;
+}
+
+static __always_inline bool PageAnon(struct page *page)
{
- page = compound_head(page);
- return ((unsigned long)page->mapping & PAGE_MAPPING_ANON) != 0;
+ return FolioAnon(page_folio(page));
}
static __always_inline int __PageMovable(struct page *page)
@@ -497,30 +542,32 @@ static __always_inline int __PageMovable(struct page *page)
* is found in VM_MERGEABLE vmas. It's a PageAnon page, pointing not to any
* anon_vma, but to that page's node of the stable tree.
*/
-static __always_inline int PageKsm(struct page *page)
+static __always_inline bool FolioKsm(struct folio *folio)
{
- page = compound_head(page);
- return ((unsigned long)page->mapping & PAGE_MAPPING_FLAGS) ==
+ return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) ==
PAGE_MAPPING_KSM;
}
+
+static __always_inline bool PageKsm(struct page *page)
+{
+ return FolioKsm(page_folio(page));
+}
#else
TESTPAGEFLAG_FALSE(Ksm)
#endif
u64 stable_page_flags(struct page *page);
-static inline int PageUptodate(struct page *page)
+static inline int FolioUptodate(struct folio *folio)
{
- int ret;
- page = compound_head(page);
- ret = test_bit(PG_uptodate, &(page)->flags);
+ int ret = test_bit(PG_uptodate, folio_flags(folio, 0));
/*
* Must ensure that the data we read out of the page is loaded
* _after_ we've loaded page->flags to check for PageUptodate.
* We can skip the barrier if the page is not uptodate, because
* we wouldn't be reading anything from it.
*
- * See SetPageUptodate() for the other side of the story.
+ * See SetFolioUptodate() for the other side of the story.
*/
if (ret)
smp_rmb();
@@ -528,23 +575,36 @@ static inline int PageUptodate(struct page *page)
return ret;
}
-static __always_inline void __SetPageUptodate(struct page *page)
+static inline int PageUptodate(struct page *page)
+{
+ return FolioUptodate(page_folio(page));
+}
+
+static __always_inline void __SetFolioUptodate(struct folio *folio)
{
- VM_BUG_ON_PAGE(PageTail(page), page);
smp_wmb();
- __set_bit(PG_uptodate, &page->flags);
+ __set_bit(PG_uptodate, folio_flags(folio, 0));
}
-static __always_inline void SetPageUptodate(struct page *page)
+static __always_inline void SetFolioUptodate(struct folio *folio)
{
- VM_BUG_ON_PAGE(PageTail(page), page);
/*
* Memory barrier must be issued before setting the PG_uptodate bit,
* so that all previous stores issued in order to bring the page
* uptodate are actually visible before PageUptodate becomes true.
*/
smp_wmb();
- set_bit(PG_uptodate, &page->flags);
+ set_bit(PG_uptodate, folio_flags(folio, 0));
+}
+
+static __always_inline void __SetPageUptodate(struct page *page)
+{
+ __SetFolioUptodate((struct folio *)page);
+}
+
+static __always_inline void SetPageUptodate(struct page *page)
+{
+ SetFolioUptodate((struct folio *)page);
}
CLEARPAGEFLAG(Uptodate, uptodate, PF_NO_TAIL)
@@ -569,6 +629,17 @@ static inline void set_page_writeback_keepwrite(struct page *page)
__PAGEFLAG(Head, head, PF_ANY) CLEARPAGEFLAG(Head, head, PF_ANY)
+/* Whether there are one or multiple pages in a folio */
+static inline bool FolioSingle(struct folio *folio)
+{
+ return !FolioHead(folio);
+}
+
+static inline bool FolioMulti(struct folio *folio)
+{
+ return FolioHead(folio);
+}
+
static __always_inline void set_compound_head(struct page *page, struct page *head)
{
WRITE_ONCE(page->compound_head, (unsigned long)head + 1);
@@ -592,12 +663,15 @@ static inline void ClearPageCompound(struct page *page)
#ifdef CONFIG_HUGETLB_PAGE
int PageHuge(struct page *page);
int PageHeadHuge(struct page *page);
+static inline bool FolioHuge(struct folio *folio)
+{
+ return PageHeadHuge(&folio->page);
+}
#else
TESTPAGEFLAG_FALSE(Huge)
TESTPAGEFLAG_FALSE(HeadHuge)
#endif
-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
/*
* PageHuge() only returns true for hugetlbfs pages, but not for
@@ -613,6 +687,11 @@ static inline int PageTransHuge(struct page *page)
return PageHead(page);
}
+static inline bool FolioTransHuge(struct folio *folio)
+{
+ return FolioHead(folio);
+}
+
/*
* PageTransCompound returns true for both transparent huge pages
* and hugetlbfs pages, so it should only be called when it's known
@@ -844,6 +923,11 @@ static inline int page_has_private(struct page *page)
return !!(page->flags & PAGE_FLAGS_PRIVATE);
}
+static inline bool folio_has_private(struct folio *folio)
+{
+ return page_has_private(&folio->page);
+}
+
#undef PF_ANY
#undef PF_HEAD
#undef PF_ONLY_HEAD
--
2.30.2
next prev parent reply other threads:[~2021-03-31 18:51 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 18:47 [PATCH v6 00/27] Memory Folios Matthew Wilcox (Oracle)
2021-03-31 18:47 ` [PATCH v6 01/27] mm: Introduce struct folio Matthew Wilcox (Oracle)
2021-04-06 12:29 ` Kirill A. Shutemov
2021-04-06 12:48 ` Matthew Wilcox
2021-04-06 14:21 ` Kirill A. Shutemov
2021-04-06 14:31 ` Christoph Hellwig
2021-04-06 14:40 ` Matthew Wilcox
2021-04-06 14:47 ` Christoph Hellwig
2021-04-06 14:55 ` Matthew Wilcox
2021-04-06 15:05 ` Christoph Hellwig
2021-04-06 16:25 ` Matthew Wilcox
2021-04-07 6:09 ` Christoph Hellwig
2021-04-08 9:01 ` Rasmus Villemoes
2021-03-31 18:47 ` [PATCH v6 02/27] mm: Add folio_pgdat and folio_zone Matthew Wilcox (Oracle)
2021-04-06 13:23 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 03/27] mm/vmstat: Add functions to account folio statistics Matthew Wilcox (Oracle)
2021-04-06 13:25 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 04/27] mm/debug: Add VM_BUG_ON_FOLIO and VM_WARN_ON_ONCE_FOLIO Matthew Wilcox (Oracle)
2021-04-06 13:26 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 05/27] mm: Add folio reference count functions Matthew Wilcox (Oracle)
2021-04-06 13:30 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 06/27] mm: Add put_folio Matthew Wilcox (Oracle)
2021-04-06 13:31 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 07/27] mm: Add get_folio Matthew Wilcox (Oracle)
2021-04-06 13:32 ` Christoph Hellwig
2021-03-31 18:47 ` Matthew Wilcox (Oracle) [this message]
2021-04-06 13:34 ` [PATCH v6 08/27] mm: Create FolioFlags Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 09/27] mm: Handle per-folio private data Matthew Wilcox (Oracle)
2021-04-06 13:37 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 10/27] mm/filemap: Add folio_index, folio_file_page and folio_contains Matthew Wilcox (Oracle)
2021-04-06 13:39 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 11/27] mm/filemap: Add folio_next_index Matthew Wilcox (Oracle)
2021-04-06 13:40 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 12/27] mm/filemap: Add folio_offset and folio_file_offset Matthew Wilcox (Oracle)
2021-04-06 13:42 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 13/27] mm/util: Add folio_mapping and folio_file_mapping Matthew Wilcox (Oracle)
2021-04-06 13:45 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 14/27] mm: Add folio_mapcount Matthew Wilcox (Oracle)
2021-04-06 13:46 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 15/27] mm/memcg: Add folio wrappers for various functions Matthew Wilcox (Oracle)
2021-04-06 13:48 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 16/27] mm/filemap: Add unlock_folio Matthew Wilcox (Oracle)
2021-04-06 13:51 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 17/27] mm/filemap: Add lock_folio Matthew Wilcox (Oracle)
2021-04-06 13:52 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 18/27] mm/filemap: Add lock_folio_killable Matthew Wilcox (Oracle)
2021-04-06 13:53 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 19/27] mm/filemap: Add __lock_folio_async Matthew Wilcox (Oracle)
2021-04-06 13:55 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 20/27] mm/filemap: Add __lock_folio_or_retry Matthew Wilcox (Oracle)
2021-04-06 13:57 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 21/27] mm/filemap: Add wait_on_folio_locked Matthew Wilcox (Oracle)
2021-04-06 14:11 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 22/27] mm/filemap: Add end_folio_writeback Matthew Wilcox (Oracle)
2021-04-06 14:13 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 23/27] mm/writeback: Add wait_on_folio_writeback Matthew Wilcox (Oracle)
2021-04-06 14:15 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 24/27] mm/writeback: Add wait_for_stable_folio Matthew Wilcox (Oracle)
2021-04-06 14:18 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 25/27] mm/filemap: Convert wait_on_page_bit to wait_on_folio_bit Matthew Wilcox (Oracle)
2021-04-06 14:19 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 26/27] mm/filemap: Convert wake_up_page_bit to wake_up_folio_bit Matthew Wilcox (Oracle)
2021-04-06 14:23 ` Christoph Hellwig
2021-03-31 18:47 ` [PATCH v6 27/27] mm/filemap: Convert page wait queues to be folios Matthew Wilcox (Oracle)
2021-04-06 14:25 ` Christoph Hellwig
2021-04-01 7:05 ` [PATCH v6 00/27] Memory Folios Christoph Hellwig
2021-04-01 11:26 ` Matthew Wilcox
2021-04-01 12:28 ` Jason Gunthorpe
2021-04-01 12:52 ` Matthew Wilcox
2021-04-01 13:30 ` Jason Gunthorpe
2021-04-02 14:37 ` Christoph Hellwig
2021-04-02 14:49 ` Matthew Wilcox
2021-04-03 0:31 ` Kent Overstreet
2021-04-05 19:14 ` Jeff Layton
2021-04-05 19:31 ` Matthew Wilcox
2021-04-06 15:14 ` Jeff Layton
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=20210331184728.1188084-9-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cachefs@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).