damon.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	David Hildenbrand <david@redhat.com>,
	Oscar Salvador <osalvador@suse.de>, SeongJae Park <sj@kernel.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<damon@lists.linux.dev>, <vishal.moola@gmail.com>,
	<willy@infradead.org>, Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH -next 7/8] mm: damon: vaddr: convert damon_young_pmd_entry() to use folio
Date: Tue, 13 Dec 2022 17:27:34 +0800	[thread overview]
Message-ID: <20221213092735.187924-8-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20221213092735.187924-1-wangkefeng.wang@huawei.com>

With damon_get_folio(), let's convert damon_young_pmd_entry()
to use folios.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/damon/vaddr.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c
index 15f03df66db6..2fab7241aa04 100644
--- a/mm/damon/vaddr.c
+++ b/mm/damon/vaddr.c
@@ -431,7 +431,7 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr,
 {
 	pte_t *pte;
 	spinlock_t *ptl;
-	struct page *page;
+	struct folio *folio;
 	struct damon_young_walk_private *priv = walk->private;
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -446,16 +446,16 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr,
 			spin_unlock(ptl);
 			goto regular_page;
 		}
-		page = damon_get_page(pmd_pfn(*pmd));
-		if (!page)
+		folio = damon_get_folio(pmd_pfn(*pmd));
+		if (!folio)
 			goto huge_out;
-		if (pmd_young(*pmd) || !page_is_idle(page) ||
+		if (pmd_young(*pmd) || !folio_test_idle(folio) ||
 					mmu_notifier_test_young(walk->mm,
 						addr)) {
 			*priv->page_sz = HPAGE_PMD_SIZE;
 			priv->young = true;
 		}
-		put_page(page);
+		folio_put(folio);
 huge_out:
 		spin_unlock(ptl);
 		return 0;
@@ -469,15 +469,15 @@ static int damon_young_pmd_entry(pmd_t *pmd, unsigned long addr,
 	pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
 	if (!pte_present(*pte))
 		goto out;
-	page = damon_get_page(pte_pfn(*pte));
-	if (!page)
+	folio = damon_get_folio(pte_pfn(*pte));
+	if (!folio)
 		goto out;
-	if (pte_young(*pte) || !page_is_idle(page) ||
+	if (pte_young(*pte) || !folio_test_idle(folio) ||
 			mmu_notifier_test_young(walk->mm, addr)) {
-		*priv->page_sz = PAGE_SIZE;
+		*priv->page_sz = PAGE_SIZE * folio_nr_pages(folio);
 		priv->young = true;
 	}
-	put_page(page);
+	folio_put(folio);
 out:
 	pte_unmap_unlock(pte, ptl);
 	return 0;
-- 
2.35.3


  parent reply	other threads:[~2022-12-13  9:11 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-13  9:27 [PATCH -next 0/8] mm: converted page idle and damon to use folios Kefeng Wang
2022-12-13  9:27 ` [PATCH -next 1/8] mm: memory_hotplug: add pfn_to_online_folio() Kefeng Wang
2022-12-13 11:13   ` kernel test robot
2022-12-13 11:36     ` Kefeng Wang
2022-12-13 11:23   ` kernel test robot
2022-12-13 11:40   ` David Hildenbrand
2022-12-13 12:13     ` Kefeng Wang
2022-12-13 14:42       ` David Hildenbrand
2022-12-13 14:47       ` Matthew Wilcox
2022-12-14  1:10         ` Kefeng Wang
2022-12-13 12:03   ` kernel test robot
2022-12-14  4:15   ` kernel test robot
2022-12-13  9:27 ` [PATCH -next 2/8] mm: page_idle: Convert page idle to use folios Kefeng Wang
2022-12-13 14:34   ` Matthew Wilcox
2022-12-13 19:14   ` SeongJae Park
2022-12-13  9:27 ` [PATCH -next 3/8] mm: huge_memory: convert split_huge_pages_all() " Kefeng Wang
2022-12-13  9:27 ` [PATCH -next 4/8] mm: damon: add temporary damon_get_folio() Kefeng Wang
2022-12-13 14:40   ` Matthew Wilcox
2022-12-13 19:18     ` SeongJae Park
2022-12-13  9:27 ` [PATCH -next 5/8] mm: damon: convert damon_ptep/pmdp_mkold() to use folios Kefeng Wang
2022-12-13  9:27 ` [PATCH -next 6/8] mm: damon: paddr: convert damon_pa_*() " Kefeng Wang
2022-12-13  9:27 ` Kefeng Wang [this message]
2022-12-13  9:27 ` [PATCH -next 8/8] mm: damon: remove unneed damon_get_page() Kefeng Wang
2022-12-13 19:26   ` SeongJae Park

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=20221213092735.187924-8-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=damon@lists.linux.dev \
    --cc=david@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=osalvador@suse.de \
    --cc=sj@kernel.org \
    --cc=vishal.moola@gmail.com \
    --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).