mm/damon: remove unused target param of get_scheme_score()

damon_target is not used by get_scheme_score operations, nor with virtual
neither with physical addresses.

Link: https://lkml.kernel.org/r/20260213145032.1740407-1-gutierrez.asier@huawei-partners.com
Signed-off-by: Asier Gutierrez <gutierrez.asier@huawei-partners.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Quanmin Yan <yanquanmin1@huawei.com>
Cc: ze zuo <zuoze1@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/damon.h b/include/linux/damon.h
index be3d198043ff9f8fad3e2f410a17c4095caa3fd7..60e6da3012fad0620845f88d684a69331b4df206 100644 (file)
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -647,8 +647,7 @@ struct damon_operations {
        void (*prepare_access_checks)(struct damon_ctx *context);
        unsigned int (*check_accesses)(struct damon_ctx *context);
        int (*get_scheme_score)(struct damon_ctx *context,
-                       struct damon_target *t, struct damon_region *r,
-                       struct damos *scheme);
+                       struct damon_region *r, struct damos *scheme);
        unsigned long (*apply_scheme)(struct damon_ctx *context,
                        struct damon_target *t, struct damon_region *r,
                        struct damos *scheme, unsigned long *sz_filter_passed);

diff --git a/mm/damon/core.c b/mm/damon/core.c
index 3e1890d64d067a3c880d2a5bc9671a85afb759a4..0e5ada441b0580dcea91213fcbe4003a94fe5e93 100644 (file)
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -1689,15 +1689,15 @@ static bool __damos_valid_target(struct damon_region *r, struct damos *s)
                r->age <= s->pattern.max_age_region;
 }
 
-static bool damos_valid_target(struct damon_ctx *c, struct damon_target *t,
-               struct damon_region *r, struct damos *s)
+static bool damos_valid_target(struct damon_ctx *c, struct damon_region *r,
+               struct damos *s)
 {
        bool ret = __damos_valid_target(r, s);
 
        if (!ret || !s->quota.esz || !c->ops.get_scheme_score)
                return ret;
 
-       return c->ops.get_scheme_score(c, t, r, s) >= s->quota.min_score;
+       return c->ops.get_scheme_score(c, r, s) >= s->quota.min_score;
 }
 
 /*
@@ -2021,7 +2021,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c,
                                s->max_nr_snapshots <= s->stat.nr_snapshots)
                        continue;
 
-               if (damos_valid_target(c, t, r, s))
+               if (damos_valid_target(c, r, s))
                        damos_apply_scheme(c, t, r, s);
 
                if (damon_is_last_region(r, t))
@@ -2319,7 +2319,7 @@ static void damos_adjust_quota(struct damon_ctx *c, struct damos *s)
                damon_for_each_region(r, t) {
                        if (!__damos_valid_target(r, s))
                                continue;
-                       score = c->ops.get_scheme_score(c, t, r, s);
+                       score = c->ops.get_scheme_score(c, r, s);
                        c->regions_score_histogram[score] +=
                                damon_sz_region(r);
                        if (score > max_score)

diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c
index 9bfe488268407cbda62db3545c3822f66da3968b..5cdcc5037cbc1efc767c1befabcbfe24f25970f7 100644 (file)
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
@@ -343,8 +343,7 @@ static unsigned long damon_pa_apply_scheme(struct damon_ctx *ctx,
 }
 
 static int damon_pa_scheme_score(struct damon_ctx *context,
-               struct damon_target *t, struct damon_region *r,
-               struct damos *scheme)
+               struct damon_region *r, struct damos *scheme)
 {
        switch (scheme->action) {
        case DAMOS_PAGEOUT:

diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c
index 729b7ffd3565b91cfaf6d24d24f07c3b830c208e..4d6d8251d41997d5302fbbce14ed9b223933d871 100644 (file)
--- a/mm/damon/vaddr.c
+++ b/mm/damon/vaddr.c
@@ -985,8 +985,7 @@ static unsigned long damon_va_apply_scheme(struct damon_ctx *ctx,
 }
 
 static int damon_va_scheme_score(struct damon_ctx *context,
-               struct damon_target *t, struct damon_region *r,
-               struct damos *scheme)
+               struct damon_region *r, struct damos *scheme)
 {
 
        switch (scheme->action) {