The patch titled
Subject: mm/damon/paddr,vaddr: remove damon_{p,v}a_{target_valid,set_operations}()
has been removed from the -mm tree. Its filename was
mm-damon-paddrvaddr-remove-damon_pva_target_validset_operations.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: SeongJae Park <sj@xxxxxxxxxx>
Subject: mm/damon/paddr,vaddr: remove damon_{p,v}a_{target_valid,set_operations}()
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.
Link: https://lkml.kernel.org/r/20220215184603.1479-9-sj@xxxxxxxxxx
Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Xin Hao <xhao@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/damon.h | 10 ----------
mm/damon/paddr.c | 20 +-------------------
mm/damon/vaddr.c | 15 +--------------
3 files changed, 2 insertions(+), 43 deletions(-)
--- a/include/linux/damon.h~mm-damon-paddrvaddr-remove-damon_pva_target_validset_operations
+++ a/include/linux/damon.h
@@ -513,14 +513,4 @@ int damon_stop(struct damon_ctx **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 */
--- a/mm/damon/paddr.c~mm-damon-paddrvaddr-remove-damon_pva_target_validset_operations
+++ a/mm/damon/paddr.c
@@ -208,11 +208,6 @@ static unsigned int damon_pa_check_acces
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
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,
--- a/mm/damon/vaddr.c~mm-damon-paddrvaddr-remove-damon_pva_target_validset_operations
+++ a/mm/damon/vaddr.c
@@ -653,7 +653,7 @@ static unsigned int damon_va_check_acces
* 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
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 = {
_
Patches currently in -mm which might be from sj@xxxxxxxxxx are
