mm-damon-core-reduce-parameters-for-damon_set_attrs.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/core: reduce parameters for damon_set_attrs()
has been removed from the -mm tree. Its filename was
mm-damon-core-reduce-parameters-for-damon_set_attrs.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon/core: reduce parameters for damon_set_attrs()
Date: Tue, 13 Sep 2022 17:44:33 +0000
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'.
---
include/linux/damon.h | 4 +--- mm/damon/core.c | 21 +++++---------------- mm/damon/dbgfs.c | 9 ++++++--- mm/damon/lru_sort.c | 10 ++++++++-- mm/damon/reclaim.c | 10 ++++++++-- mm/damon/sysfs.c | 12 ++++++++---- 6 files changed, 36 insertions(+), 30 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-core-reduce-parameters-for-damon_set_attrs +1 -3
@@ -540,9 +540,7 @@ unsigned int damon_nr_regions(struct damstruct 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 );
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-core-reduce-parameters-for-damon_set_attrs +5 -16
@@ -428,32 +428,21 @@ void damon_destroy_ctx(struct damon_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 ; }
mm/damon/dbgfs.c renamed from mm/damon/dbgfs.c~mm-damon-core-reduce-parameters-for-damon_set_attrs +6 -3
@@ -67,7 +67,7 @@ static ssize_t dbgfs_attrs_write(struct 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(structreturn 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 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:
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-core-reduce-parameters-for-damon_set_attrs +8 -2
@@ -350,13 +350,19 @@ static struct damos *damon_lru_sort_new_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;
mm/damon/reclaim.c renamed from mm/damon/reclaim.c~mm-damon-core-reduce-parameters-for-damon_set_attrs +8 -2
@@ -275,12 +275,18 @@ static struct damos *damon_reclaim_new_sstatic 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;
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-core-reduce-parameters-for-damon_set_attrs +8 -4
@@ -2130,10 +2130,14 @@ static int damon_sysfs_set_attrs(structstruct 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)
_
Patches currently in -mm which might be from [email protected] are
mm-damon-core-initialize-damon_target-list-in-damon_new_target.patch