Commit 6b7cea90 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton

mm/damon/vaddr: convert hugetlb related functions to use a folio

Convert damon_hugetlb_mkold() and damon_young_hugetlb_entry() to
use a folio.

Link: https://lkml.kernel.org/r/20221230070849.63358-9-wangkefeng.wang@huawei.comSigned-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSeongJae Park <sj@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7824debb
...@@ -335,9 +335,9 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, ...@@ -335,9 +335,9 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm,
{ {
bool referenced = false; bool referenced = false;
pte_t entry = huge_ptep_get(pte); pte_t entry = huge_ptep_get(pte);
struct page *page = pte_page(entry); struct folio *folio = pfn_folio(pte_pfn(entry));
get_page(page); folio_get(folio);
if (pte_young(entry)) { if (pte_young(entry)) {
referenced = true; referenced = true;
...@@ -352,10 +352,10 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm, ...@@ -352,10 +352,10 @@ static void damon_hugetlb_mkold(pte_t *pte, struct mm_struct *mm,
#endif /* CONFIG_MMU_NOTIFIER */ #endif /* CONFIG_MMU_NOTIFIER */
if (referenced) if (referenced)
set_page_young(page); folio_set_young(folio);
set_page_idle(page); folio_set_idle(folio);
put_page(page); folio_put(folio);
} }
static int damon_mkold_hugetlb_entry(pte_t *pte, unsigned long hmask, static int damon_mkold_hugetlb_entry(pte_t *pte, unsigned long hmask,
...@@ -490,7 +490,7 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask, ...@@ -490,7 +490,7 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask,
{ {
struct damon_young_walk_private *priv = walk->private; struct damon_young_walk_private *priv = walk->private;
struct hstate *h = hstate_vma(walk->vma); struct hstate *h = hstate_vma(walk->vma);
struct page *page; struct folio *folio;
spinlock_t *ptl; spinlock_t *ptl;
pte_t entry; pte_t entry;
...@@ -499,16 +499,16 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask, ...@@ -499,16 +499,16 @@ static int damon_young_hugetlb_entry(pte_t *pte, unsigned long hmask,
if (!pte_present(entry)) if (!pte_present(entry))
goto out; goto out;
page = pte_page(entry); folio = pfn_folio(pte_pfn(entry));
get_page(page); folio_get(folio);
if (pte_young(entry) || !page_is_idle(page) || if (pte_young(entry) || !folio_test_idle(folio) ||
mmu_notifier_test_young(walk->mm, addr)) { mmu_notifier_test_young(walk->mm, addr)) {
*priv->page_sz = huge_page_size(h); *priv->page_sz = huge_page_size(h);
priv->young = true; priv->young = true;
} }
put_page(page); folio_put(folio);
out: out:
spin_unlock(ptl); spin_unlock(ptl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment