mm/damon/paddr: deduplicate damon_pa_{mark_accessed,deactivate_pages}()

The bodies of damon_pa_{mark_accessed,deactivate_pages}() contains
duplicates.  This commit factors out the common part to a separate
function and removes the duplicates.

Link: https://lkml.kernel.org/r/20220913174449.50645-3-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index 219127cb49e2e4d17489b2ae5d71f811aa8da670..1ada62db68b13fc369fa4b958a9698df859a6af4 100644 (file)
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -232,7 +232,8 @@ static unsigned long damon_pa_pageout(struct damon_region *r)
        return applied * PAGE_SIZE;
 }
 
-static unsigned long damon_pa_mark_accessed(struct damon_region *r)
+static inline unsigned long damon_pa_mark_accessed_or_deactivate(
+               struct damon_region *r, bool mark_accessed)
 {
        unsigned long addr, applied = 0;
 
@@ -241,27 +242,24 @@ static unsigned long damon_pa_mark_accessed(struct damon_region *r)
 
                if (!page)
                        continue;
-               mark_page_accessed(page);
+               if (mark_accessed)
+                       mark_page_accessed(page);
+               else
+                       deactivate_page(page);
                put_page(page);
                applied++;
        }
        return applied * PAGE_SIZE;
 }
 
-static unsigned long damon_pa_deactivate_pages(struct damon_region *r)
+static unsigned long damon_pa_mark_accessed(struct damon_region *r)
 {
-       unsigned long addr, applied = 0;
-
-       for (addr = r->ar.start; addr < r->ar.end; addr += PAGE_SIZE) {
-               struct page *page = damon_get_page(PHYS_PFN(addr));
+       return damon_pa_mark_accessed_or_deactivate(r, true);
+}
 
-               if (!page)
-                       continue;
-               deactivate_page(page);
-               put_page(page);
-               applied++;
-       }
-       return applied * PAGE_SIZE;
+static unsigned long damon_pa_deactivate_pages(struct damon_region *r)
+{
+       return damon_pa_mark_accessed_or_deactivate(r, false);
 }
 
 static unsigned long damon_pa_apply_scheme(struct damon_ctx *ctx,