mm/damon/core: reduce parameters for damon_set_attrs()

Number of parameters for 'damon_set_attrs()' is six.  As it could be
confusing and verbose, this commit reduces the number by receiving single
pointer to a 'struct damon_attrs'.

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

diff --git a/include/linux/damon.h b/include/linux/damon.h
index 2ceee8b07726b4807af2baf3ebe4bc7979bb99d1..c5dc0c77c7722012515b307ed6701912dcafc7ea 100644 (file)
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -540,9 +540,7 @@ unsigned int damon_nr_regions(struct damon_target *t);
 
 struct damon_ctx *damon_new_ctx(void);
 void damon_destroy_ctx(struct damon_ctx *ctx);
-int damon_set_attrs(struct damon_ctx *ctx, unsigned long sample_int,
-               unsigned long aggr_int, unsigned long ops_upd_int,
-               unsigned long min_nr_reg, unsigned long max_nr_reg);
+int damon_set_attrs(struct damon_ctx *ctx, struct damon_attrs *attrs);
 int damon_set_schemes(struct damon_ctx *ctx,
                        struct damos **schemes, ssize_t nr_schemes);
 int damon_nr_running_ctxs(void);

diff --git a/mm/damon/core.c b/mm/damon/core.c
index bbd4c2d991dda6aff62447bf4917fc875fcaa1f9..29635a82cb691747b3b0f54abf4e104bbd06aa0b 100644 (file)
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -428,32 +428,21 @@ void damon_destroy_ctx(struct damon_ctx *ctx)
 /**
  * damon_set_attrs() - Set attributes for the monitoring.
  * @ctx:               monitoring context
- * @sample_int:                time interval between samplings
- * @aggr_int:          time interval between aggregations
- * @ops_upd_int:       time interval between monitoring operations updates
- * @min_nr_reg:                minimal number of regions
- * @max_nr_reg:                maximum number of regions
+ * @attrs:             monitoring attributes
  *
  * This function should not be called while the kdamond is running.
  * Every time interval is in micro-seconds.
  *
  * Return: 0 on success, negative error code otherwise.
  */
-int damon_set_attrs(struct damon_ctx *ctx, unsigned long sample_int,
-                   unsigned long aggr_int, unsigned long ops_upd_int,
-                   unsigned long min_nr_reg, unsigned long max_nr_reg)
+int damon_set_attrs(struct damon_ctx *ctx, struct damon_attrs *attrs)
 {
-       if (min_nr_reg < 3)
+       if (attrs->min_nr_regions < 3)
                return -EINVAL;
-       if (min_nr_reg > max_nr_reg)
+       if (attrs->min_nr_regions > attrs->max_nr_regions)
                return -EINVAL;
 
-       ctx->attrs.sample_interval = sample_int;
-       ctx->attrs.aggr_interval = aggr_int;
-       ctx->attrs.ops_update_interval = ops_upd_int;
-       ctx->attrs.min_nr_regions = min_nr_reg;
-       ctx->attrs.max_nr_regions = max_nr_reg;
-
+       ctx->attrs = *attrs;
        return 0;
 }
 

diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
index 74e7542af6d34e570257b3cea99cae5e11783792..c00eba4448d850536c41b88862b3d70781faae6b 100644 (file)
--- a/mm/damon/dbgfs.c
+++ b/mm/damon/dbgfs.c
@@ -67,7 +67,7 @@ static ssize_t dbgfs_attrs_write(struct file *file,
                const char __user *buf, size_t count, loff_t *ppos)
 {
        struct damon_ctx *ctx = file->private_data;
-       unsigned long s, a, r, minr, maxr;
+       struct damon_attrs attrs;
        char *kbuf;
        ssize_t ret;
 
@@ -76,7 +76,10 @@ static ssize_t dbgfs_attrs_write(struct file *file,
                return PTR_ERR(kbuf);
 
        if (sscanf(kbuf, "%lu %lu %lu %lu %lu",
-                               &s, &a, &r, &minr, &maxr) != 5) {
+                               &attrs.sample_interval, &attrs.aggr_interval,
+                               &attrs.ops_update_interval,
+                               &attrs.min_nr_regions,
+                               &attrs.max_nr_regions) != 5) {
                ret = -EINVAL;
                goto out;
        }
@@ -87,7 +90,7 @@ static ssize_t dbgfs_attrs_write(struct file *file,
                goto unlock_out;
        }
 
-       ret = damon_set_attrs(ctx, s, a, r, minr, maxr);
+       ret = damon_set_attrs(ctx, &attrs);
        if (!ret)
                ret = count;
 unlock_out:

diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c
index 307ba71adcfa96e9d291362cb0f8cb7c8ddde822..6d5f83965276f77034f4dfe0c28f0c92bf2ed252 100644 (file)
--- a/mm/damon/lru_sort.c
+++ b/mm/damon/lru_sort.c
@@ -350,13 +350,19 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres)
 
 static int damon_lru_sort_apply_parameters(void)
 {
+       struct damon_attrs attrs = {
+               .sample_interval = sample_interval,
+               .aggr_interval = aggr_interval,
+               .ops_update_interval = 0,
+               .min_nr_regions = min_nr_regions,
+               .max_nr_regions = max_nr_regions,
+       };
        struct damos *scheme;
        struct damon_addr_range addr_range;
        unsigned int hot_thres, cold_thres;
        int err = 0;
 
-       err = damon_set_attrs(ctx, sample_interval, aggr_interval, 0,
-                       min_nr_regions, max_nr_regions);
+       err = damon_set_attrs(ctx, &attrs);
        if (err)
                return err;
 

diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
index fe7bc0c55ecb3393230e19bc31577ce016356e15..bc841efbab45e6408d1e0208bd56e9c747734ac7 100644 (file)
--- a/mm/damon/reclaim.c
+++ b/mm/damon/reclaim.c
@@ -275,12 +275,18 @@ static struct damos *damon_reclaim_new_scheme(void)
 
 static int damon_reclaim_apply_parameters(void)
 {
+       struct damon_attrs attrs = {
+               .sample_interval = sample_interval,
+               .aggr_interval = aggr_interval,
+               .ops_update_interval = 0,
+               .min_nr_regions = min_nr_regions,
+               .max_nr_regions = max_nr_regions,
+       };
        struct damos *scheme;
        struct damon_addr_range addr_range;
        int err = 0;
 
-       err = damon_set_attrs(ctx, sample_interval, aggr_interval, 0,
-                       min_nr_regions, max_nr_regions);
+       err = damon_set_attrs(ctx, &attrs);
        if (err)
                return err;
 

diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
index da01befae8bd45f1c0fe4e2b60d3cd7c89f5cfb0..3dbf3804ec88b69e17f899f0b3fc4bbdda36c6be 100644 (file)
--- a/mm/damon/sysfs.c
+++ b/mm/damon/sysfs.c
@@ -2130,10 +2130,14 @@ static int damon_sysfs_set_attrs(struct damon_ctx *ctx,
        struct damon_sysfs_intervals *sys_intervals = sys_attrs->intervals;
        struct damon_sysfs_ul_range *sys_nr_regions =
                sys_attrs->nr_regions_range;
-
-       return damon_set_attrs(ctx, sys_intervals->sample_us,
-                       sys_intervals->aggr_us, sys_intervals->update_us,
-                       sys_nr_regions->min, sys_nr_regions->max);
+       struct damon_attrs attrs = {
+               .sample_interval = sys_intervals->sample_us,
+               .aggr_interval = sys_intervals->aggr_us,
+               .ops_update_interval = sys_intervals->update_us,
+               .min_nr_regions = sys_nr_regions->min,
+               .max_nr_regions = sys_nr_regions->max,
+       };
+       return damon_set_attrs(ctx, &attrs);
 }
 
 static void damon_sysfs_destroy_targets(struct damon_ctx *ctx)