From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<linux-mm@kvack.org>, Matthew Wilcox <willy@infradead.org>,
David Hildenbrand <david@redhat.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 4/5] fs/proc/page: use a folio in stable_page_flags()
Date: Fri, 3 Nov 2023 15:29:05 +0800 [thread overview]
Message-ID: <20231103072906.2000381-5-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231103072906.2000381-1-wangkefeng.wang@huawei.com>
Replace ten compound_head() calls with one page_folio().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
fs/proc/page.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/proc/page.c b/fs/proc/page.c
index 195b077c0fac..94ab0ba13b16 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -109,6 +109,7 @@ static inline u64 kpf_copy_bit(u64 kflags, int ubit, int kbit)
u64 stable_page_flags(struct page *page)
{
+ struct folio *folio;
u64 k;
u64 u;
@@ -119,6 +120,7 @@ u64 stable_page_flags(struct page *page)
if (!page)
return 1 << KPF_NOPAGE;
+ folio = page_folio(page);
k = page->flags;
u = 0;
@@ -128,11 +130,11 @@ u64 stable_page_flags(struct page *page)
* Note that page->_mapcount is overloaded in SLAB, so the
* simple test in page_mapped() is not enough.
*/
- if (!PageSlab(page) && page_mapped(page))
+ if (!folio_test_slab(folio) && folio_mapped(folio))
u |= 1 << KPF_MMAP;
- if (PageAnon(page))
+ if (folio_test_anon(folio))
u |= 1 << KPF_ANON;
- if (PageKsm(page))
+ if (folio_test_ksm(folio))
u |= 1 << KPF_KSM;
/*
@@ -152,11 +154,9 @@ u64 stable_page_flags(struct page *page)
* to make sure a given page is a thp, not a non-huge compound page.
*/
else if (PageTransCompound(page)) {
- struct page *head = compound_head(page);
-
- if (PageLRU(head) || PageAnon(head))
+ if (folio_test_lru(folio) || folio_test_anon(folio))
u |= 1 << KPF_THP;
- else if (is_huge_zero_page(head)) {
+ else if (is_huge_zero_page(&folio->page)) {
u |= 1 << KPF_ZERO_PAGE;
u |= 1 << KPF_THP;
}
@@ -170,7 +170,7 @@ u64 stable_page_flags(struct page *page)
*/
if (PageBuddy(page))
u |= 1 << KPF_BUDDY;
- else if (page_count(page) == 0 && is_free_buddy_page(page))
+ else if (folio_ref_count(folio) == 0 && is_free_buddy_page(page))
u |= 1 << KPF_BUDDY;
if (PageOffline(page))
@@ -178,13 +178,13 @@ u64 stable_page_flags(struct page *page)
if (PageTable(page))
u |= 1 << KPF_PGTABLE;
- if (page_is_idle(page))
+ if (folio_test_idle(folio))
u |= 1 << KPF_IDLE;
u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked);
u |= kpf_copy_bit(k, KPF_SLAB, PG_slab);
- if (PageTail(page) && PageSlab(page))
+ if (PageTail(page) && folio_test_slab(folio))
u |= 1 << KPF_SLAB;
u |= kpf_copy_bit(k, KPF_ERROR, PG_error);
@@ -197,7 +197,7 @@ u64 stable_page_flags(struct page *page)
u |= kpf_copy_bit(k, KPF_ACTIVE, PG_active);
u |= kpf_copy_bit(k, KPF_RECLAIM, PG_reclaim);
- if (PageSwapCache(page))
+ if (folio_test_swapcache(folio))
u |= 1 << KPF_SWAPCACHE;
u |= kpf_copy_bit(k, KPF_SWAPBACKED, PG_swapbacked);
--
2.27.0
next prev parent reply other threads:[~2023-11-03 7:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-03 7:29 [PATCH 0/5] mm: remove page idle and young wrapper Kefeng Wang
2023-11-03 7:29 ` [PATCH 1/5] mm: huge_memory: use more folio api in __split_huge_page_tail() Kefeng Wang
2023-11-03 7:29 ` [PATCH 2/5] mm: task_mmu: use a folio in smaps_account() Kefeng Wang
2023-11-03 7:29 ` [PATCH 3/5] mm: task_mmu: use a folio in clear_refs_pte_range() Kefeng Wang
2023-11-03 7:29 ` Kefeng Wang [this message]
2023-11-03 12:28 ` [PATCH 4/5] fs/proc/page: use a folio in stable_page_flags() Matthew Wilcox
2023-11-03 13:07 ` Kefeng Wang
2023-11-03 7:29 ` [PATCH 5/5] page_idle: kill page idle and young wrapper Kefeng Wang
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=20231103072906.2000381-5-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.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).