linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
	Matthew Wilcox <willy@infradead.org>,
	David Hildenbrand <david@redhat.com>,
	Gregory Price <gregory.price@memverge.com>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 5/7] mm: task_mmu: use a folio in smaps_account()
Date: Fri, 10 Nov 2023 11:33:22 +0800	[thread overview]
Message-ID: <20231110033324.2455523-6-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231110033324.2455523-1-wangkefeng.wang@huawei.com>

Replace seven implicit calls to compound_head() with one page_folio().

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 fs/proc/task_mmu.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 51e0ec658457..fe15f99a4908 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -445,23 +445,25 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page,
 {
 	int i, nr = compound ? compound_nr(page) : 1;
 	unsigned long size = nr * PAGE_SIZE;
+	struct folio *folio = page_folio(page);
 
 	/*
 	 * First accumulate quantities that depend only on |size| and the type
 	 * of the compound page.
 	 */
-	if (PageAnon(page)) {
+	if (folio_test_anon(folio)) {
 		mss->anonymous += size;
-		if (!PageSwapBacked(page) && !dirty && !PageDirty(page))
+		if (!folio_test_swapbacked(folio) && !dirty &&
+		    !folio_test_dirty(folio))
 			mss->lazyfree += size;
 	}
 
-	if (PageKsm(page))
+	if (folio_test_ksm(folio))
 		mss->ksm += size;
 
 	mss->resident += size;
 	/* Accumulate the size in pages that have been accessed. */
-	if (young || page_is_young(page) || PageReferenced(page))
+	if (young || folio_test_young(folio) || folio_test_referenced(folio))
 		mss->referenced += size;
 
 	/*
@@ -479,7 +481,7 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page,
 	 * especially for migration entries.  Treat regular migration entries
 	 * as mapcount == 1.
 	 */
-	if ((page_count(page) == 1) || migration) {
+	if ((folio_ref_count(folio) == 1) || migration) {
 		smaps_page_accumulate(mss, page, size, size << PSS_SHIFT, dirty,
 			locked, true);
 		return;
-- 
2.27.0



  parent reply	other threads:[~2023-11-10  3:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-10  3:33 [PATCH v2 0/7] mm: remove page idle and young wrapper Kefeng Wang
2023-11-10  3:33 ` [PATCH v2 1/7] fs/proc/page: remove unneeded PageTail && PageSlab check Kefeng Wang
2023-11-10 18:11   ` Matthew Wilcox
2023-11-10  3:33 ` [PATCH v2 2/7] fs/proc/page: use a folio in stable_page_flags() Kefeng Wang
2023-11-10 18:15   ` Matthew Wilcox
2023-11-11  3:21     ` Kefeng Wang
2023-11-10 21:50   ` Gregory Price
2023-11-10  3:33 ` [PATCH v2 3/7] fs/proc/page: respect folio head-page flag placement Kefeng Wang
2023-11-10 18:19   ` Matthew Wilcox
2023-11-11  9:49     ` Kefeng Wang
2023-11-10  3:33 ` [PATCH v2 4/7] mm: huge_memory: use more folio api in __split_huge_page_tail() Kefeng Wang
2023-11-10 18:20   ` Matthew Wilcox
2023-11-11 10:00     ` Kefeng Wang
2023-11-10  3:33 ` Kefeng Wang [this message]
2023-11-10 18:29   ` [PATCH v2 5/7] mm: task_mmu: use a folio in smaps_account() Matthew Wilcox
2023-11-11 10:57     ` Kefeng Wang
2023-11-10  3:33 ` [PATCH v2 6/7] mm: task_mmu: use a folio in clear_refs_pte_range() Kefeng Wang
2023-11-10  3:33 ` [PATCH v2 7/7] 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=20231110033324.2455523-6-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=gregory.price@memverge.com \
    --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