From: SeongJae Park <sj@kernel.org>
To: akpm@linux-foundation.org
Cc: xhao@linux.alibaba.com, rientjes@google.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, SeongJae Park <sj@kernel.org>
Subject: [PATCH 8/8] mm/damon/paddr,vaddr: Remove damon_{p,v}a_{target_valid,set_operations}()
Date: Tue, 15 Feb 2022 18:46:03 +0000 [thread overview]
Message-ID: <20220215184603.1479-9-sj@kernel.org> (raw)
In-Reply-To: <20220215184603.1479-1-sj@kernel.org>
Because DAMON debugfs interface and DAMON-based proactive reclaim are
now using monitoring operations via registration mechanism,
damon_{p,v}a_{target_valid,set_operations}() functions have no user.
This commit clean them up.
Signed-off-by: SeongJae Park <sj@kernel.org>
---
include/linux/damon.h | 10 ----------
mm/damon/paddr.c | 20 +-------------------
mm/damon/vaddr.c | 15 +--------------
3 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/include/linux/damon.h b/include/linux/damon.h
index 076da277b249..49c4a11ecf20 100644
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -513,14 +513,4 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs);
#endif /* CONFIG_DAMON */
-#ifdef CONFIG_DAMON_VADDR
-bool damon_va_target_valid(void *t);
-void damon_va_set_operations(struct damon_ctx *ctx);
-#endif /* CONFIG_DAMON_VADDR */
-
-#ifdef CONFIG_DAMON_PADDR
-bool damon_pa_target_valid(void *t);
-void damon_pa_set_operations(struct damon_ctx *ctx);
-#endif /* CONFIG_DAMON_PADDR */
-
#endif /* _DAMON_H */
diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index d968bb38bd5d..7c263797a9a9 100644
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -208,11 +208,6 @@ static unsigned int damon_pa_check_accesses(struct damon_ctx *ctx)
return max_nr_accesses;
}
-bool damon_pa_target_valid(void *t)
-{
- return true;
-}
-
static unsigned long damon_pa_apply_scheme(struct damon_ctx *ctx,
struct damon_target *t, struct damon_region *r,
struct damos *scheme)
@@ -261,19 +256,6 @@ static int damon_pa_scheme_score(struct damon_ctx *context,
return DAMOS_MAX_SCORE;
}
-void damon_pa_set_operations(struct damon_ctx *ctx)
-{
- ctx->ops.init = NULL;
- ctx->ops.update = NULL;
- ctx->ops.prepare_access_checks = damon_pa_prepare_access_checks;
- ctx->ops.check_accesses = damon_pa_check_accesses;
- ctx->ops.reset_aggregated = NULL;
- ctx->ops.target_valid = damon_pa_target_valid;
- ctx->ops.cleanup = NULL;
- ctx->ops.apply_scheme = damon_pa_apply_scheme;
- ctx->ops.get_scheme_score = damon_pa_scheme_score;
-}
-
static int __init damon_pa_initcall(void)
{
struct damon_operations ops = {
@@ -283,7 +265,7 @@ static int __init damon_pa_initcall(void)
.prepare_access_checks = damon_pa_prepare_access_checks,
.check_accesses = damon_pa_check_accesses,
.reset_aggregated = NULL,
- .target_valid = damon_pa_target_valid,
+ .target_valid = NULL,
.cleanup = NULL,
.apply_scheme = damon_pa_apply_scheme,
.get_scheme_score = damon_pa_scheme_score,
diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c
index 87475ba37bec..b2ec0aa1ff45 100644
--- a/mm/damon/vaddr.c
+++ b/mm/damon/vaddr.c
@@ -653,7 +653,7 @@ static unsigned int damon_va_check_accesses(struct damon_ctx *ctx)
* Functions for the target validity check and cleanup
*/
-bool damon_va_target_valid(void *target)
+static bool damon_va_target_valid(void *target)
{
struct damon_target *t = target;
struct task_struct *task;
@@ -739,19 +739,6 @@ static int damon_va_scheme_score(struct damon_ctx *context,
return DAMOS_MAX_SCORE;
}
-void damon_va_set_operations(struct damon_ctx *ctx)
-{
- ctx->ops.init = damon_va_init;
- ctx->ops.update = damon_va_update;
- ctx->ops.prepare_access_checks = damon_va_prepare_access_checks;
- ctx->ops.check_accesses = damon_va_check_accesses;
- ctx->ops.reset_aggregated = NULL;
- ctx->ops.target_valid = damon_va_target_valid;
- ctx->ops.cleanup = NULL;
- ctx->ops.apply_scheme = damon_va_apply_scheme;
- ctx->ops.get_scheme_score = damon_va_scheme_score;
-}
-
static int __init damon_va_initcall(void)
{
struct damon_operations ops = {
--
2.17.1
prev parent reply other threads:[~2022-02-15 18:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 18:45 [PATCH 0/8] Allow DAMON user code independent of monitoring primitives SeongJae Park
2022-02-15 18:45 ` [PATCH 1/8] mm/damon: Rename damon_primitives to damon_operations SeongJae Park
2022-02-15 18:45 ` [PATCH 2/8] mm/damon: Let monitoring operations can be registered and selected SeongJae Park
2022-02-15 18:45 ` [PATCH 3/8] mm/damon/paddr,vaddr: Register themselves to DAMON in subsys_initcall SeongJae Park
2022-02-15 18:45 ` [PATCH 4/8] mm/damon/reclaim: Use damon_select_ops() instead of damon_{v,p}a_set_operations() SeongJae Park
2022-02-15 18:46 ` [PATCH 5/8] mm/damon/dbgfs: " SeongJae Park
2022-02-15 18:46 ` [PATCH 6/8] mm/damon/dbgfs: Use operations id for knowing if the target has pid SeongJae Park
2022-02-15 18:46 ` [PATCH 7/8] mm/damon/dbgfs-test: Fix is_target_id() change SeongJae Park
2022-02-15 18:46 ` SeongJae Park [this message]
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=20220215184603.1479-9-sj@kernel.org \
--to=sj@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rientjes@google.com \
--cc=xhao@linux.alibaba.com \
/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