From: SeongJae Park <sj@kernel.org>
To: SeongJae Park <sj@kernel.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 02/22] mm/damon/paddr: deduplicate damon_pa_{mark_accessed,deactivate_pages}()
Date: Tue, 13 Sep 2022 17:44:29 +0000 [thread overview]
Message-ID: <20220913174449.50645-3-sj@kernel.org> (raw)
In-Reply-To: <20220913174449.50645-1-sj@kernel.org>
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.
Signed-off-by: SeongJae Park <sj@kernel.org>
---
mm/damon/paddr.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index 5eba09d50855..dfeebffe82f4 100644
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -231,7 +231,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;
@@ -240,27 +241,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,
--
2.25.1
next prev parent reply other threads:[~2022-09-13 17:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 17:44 [PATCH 00/22] mm/damon: cleanup code SeongJae Park
2022-09-13 17:44 ` [PATCH 01/22] mm/damon/paddr: make supported DAMOS actions of paddr clear SeongJae Park
2022-09-13 17:44 ` SeongJae Park [this message]
2022-09-13 17:44 ` [PATCH 03/22] mm/damon/core: copy struct-to-struct instead of field-to-field in damon_new_scheme() SeongJae Park
2022-09-13 17:44 ` [PATCH 04/22] mm/damon/core: factor out 'damos_quota' private fileds initialization SeongJae Park
2022-09-13 17:44 ` [PATCH 05/22] mm/damon/core: use a dedicated struct for monitoring attributes SeongJae Park
2022-09-13 17:44 ` [PATCH 06/22] mm/damon/core: reduce parameters for damon_set_attrs() SeongJae Park
2022-09-13 17:44 ` [PATCH 07/22] mm/damon/reclaim: use 'struct damon_attrs' for storing parameters for it SeongJae Park
2022-09-13 17:44 ` [PATCH 08/22] mm/damon/lru_sort: " SeongJae Park
2022-09-13 17:44 ` [PATCH 09/22] mm/damon: implement a monitoring attributes module parameters generator macro SeongJae Park
2022-09-13 17:44 ` [PATCH 10/22] mm/damon/lru_sort: use monitoring attributes parameters generaotr macro SeongJae Park
2022-09-13 17:44 ` [PATCH 11/22] mm/damon/reclaim: use monitoring attributes parameters generator macro SeongJae Park
2022-09-13 17:44 ` [PATCH 12/22] mm/damon/modules-common: implement a watermarks module " SeongJae Park
2022-09-13 17:44 ` [PATCH 13/22] mm/damon/lru_sort: use watermarks " SeongJae Park
2022-09-13 17:44 ` [PATCH 14/22] mm/damon/reclaim: " SeongJae Park
2022-09-13 17:44 ` [PATCH 15/22] mm/damon/modules-common: implement a stats " SeongJae Park
2022-09-13 17:44 ` [PATCH 16/22] mm/damon/reclaim: use stat parameters generator SeongJae Park
2022-09-13 17:44 ` [PATCH 17/22] mm/damon/lru_sort: use stat generator SeongJae Park
2022-09-13 17:44 ` [PATCH 18/22] mm/damon/modules-common: implement a damos quota params generator SeongJae Park
2022-09-13 17:44 ` [PATCH 19/22] mm/damon/modules-common: implement damos time " SeongJae Park
2022-09-13 17:44 ` [PATCH 20/22] mm/damon/reclaim: use the quota params generator macro SeongJae Park
2022-09-13 17:44 ` [PATCH 21/22] mm/damon/lru_sort: use quotas param generator SeongJae Park
2022-09-13 17:44 ` [PATCH 22/22] mm/damon/lru_sort: deduplicate hot/cold schemes generators 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=20220913174449.50645-3-sj@kernel.org \
--to=sj@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=damon@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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).