Hi Yajun,
On Wed, 7 Sep 2022 17:26:26 +0800 Yajun Deng <yajun.deng@xxxxxxxxx> wrote:
> The damon_new_scheme() has too many parameters, we can add struct
> damos_region to simplify it.
>
> In additon, we can't use bpf trace more than 5 parameters.
Good point. I have a few comments below, though.
>
> Signed-off-by: Yajun Deng <yajun.deng@xxxxxxxxx>
> ---
> include/linux/damon.h | 37 ++++++++++++++++++++-----------------
> mm/damon/core.c | 28 ++++++++++++----------------
> mm/damon/dbgfs.c | 22 ++++++++++++----------
> mm/damon/lru_sort.c | 41 ++++++++++++++++++++++++++---------------
> mm/damon/reclaim.c | 23 ++++++++++++++---------
> mm/damon/sysfs.c | 13 +++++++++----
> 6 files changed, 93 insertions(+), 71 deletions(-)
>
> diff --git a/include/linux/damon.h b/include/linux/damon.h
> index 7b1f4a488230..b9869be37af0 100644
> --- a/include/linux/damon.h
> +++ b/include/linux/damon.h
> @@ -216,13 +216,27 @@ struct damos_stat {
> };
>
> /**
> - * struct damos - Represents a Data Access Monitoring-based Operation Scheme.
> + * struct damos_region - Region on a given target.
> * @min_sz_region: Minimum size of target regions.
> * @max_sz_region: Maximum size of target regions.
> * @min_nr_accesses: Minimum ``->nr_accesses`` of target regions.
> * @max_nr_accesses: Maximum ``->nr_accesses`` of target regions.
> * @min_age_region: Minimum age of target regions.
> * @max_age_region: Maximum age of target regions.
> + */
> +
> +struct damos_region {
> + unsigned long min_sz_region;
> + unsigned long max_sz_region;
> + unsigned int min_nr_accesses;
> + unsigned int max_nr_accesses;
> + unsigned int min_age_region;
> + unsigned int max_age_region;
> +};
IMHO, the name and the comment are not so clearly explaining what this
structure is for. This structure is for specifying the access pattern of
monitoring regions that we have interest with the given scheme. How about
damos_access_pattern, instead, for example?
> +
> +/**
> + * struct damos - Represents a Data Access Monitoring-based Operation Scheme.
> + * @region: Region on a given target.
> * @action: &damo_action to be applied to the target regions.
> * @quota: Control the aggressiveness of this scheme.
> * @wmarks: Watermarks for automated (in)activation of this scheme.
> @@ -230,10 +244,8 @@ struct damos_stat {
> * @list: List head for siblings.
> *
> * For each aggregation interval, DAMON finds regions which fit in the
> - * condition (&min_sz_region, &max_sz_region, &min_nr_accesses,
> - * &max_nr_accesses, &min_age_region, &max_age_region) and applies &action to
> - * those. To avoid consuming too much CPU time or IO resources for the
> - * &action, "a is used.
> + * condition ®ion and applies &action to those. To avoid consuming
I'd rather rename 'region' to 'pattern', and 's/condition ®ion/&pattern'.
> + * too much CPU time or IO resources for the &action, "a is used.
> *
> * To do the work only when needed, schemes can be activated for specific
> * system situations using &wmarks. If all schemes that registered to the
> @@ -248,12 +260,7 @@ struct damos_stat {
> * &action is applied.
> */
> struct damos {
> - unsigned long min_sz_region;
> - unsigned long max_sz_region;
> - unsigned int min_nr_accesses;
> - unsigned int max_nr_accesses;
> - unsigned int min_age_region;
> - unsigned int max_age_region;
> + struct damos_region region;
> enum damos_action action;
> struct damos_quota quota;
> struct damos_watermarks wmarks;
> @@ -501,12 +508,8 @@ void damon_destroy_region(struct damon_region *r, struct damon_target *t);
> int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
> unsigned int nr_ranges);
>
> -struct damos *damon_new_scheme(
> - unsigned long min_sz_region, unsigned long max_sz_region,
> - unsigned int min_nr_accesses, unsigned int max_nr_accesses,
> - unsigned int min_age_region, unsigned int max_age_region,
> - enum damos_action action, struct damos_quota *quota,
> - struct damos_watermarks *wmarks);
> +struct damos *damon_new_scheme(struct damos_region *region, enum damos_action action,
> + struct damos_quota *quota, struct damos_watermarks *wmarks);
I still prefer 80 columns limit:
https://docs.kernel.org/process/coding-style.html#breaking-long-lines-and-strings
> void damon_add_scheme(struct damon_ctx *ctx, struct damos *s);
> void damon_destroy_scheme(struct damos *s);
>
> diff --git a/mm/damon/core.c b/mm/damon/core.c
> index 9964b9d00768..ef130c0a71fb 100644
> --- a/mm/damon/core.c
> +++ b/mm/damon/core.c
> @@ -230,24 +230,20 @@ int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
> return 0;
> }
>
> -struct damos *damon_new_scheme(
> - unsigned long min_sz_region, unsigned long max_sz_region,
> - unsigned int min_nr_accesses, unsigned int max_nr_accesses,
> - unsigned int min_age_region, unsigned int max_age_region,
> - enum damos_action action, struct damos_quota *quota,
> - struct damos_watermarks *wmarks)
> +struct damos *damon_new_scheme(struct damos_region *region, enum damos_action action,
> + struct damos_quota *quota, struct damos_watermarks *wmarks)
> {
> struct damos *scheme;
>
> scheme = kmalloc(sizeof(*scheme), GFP_KERNEL);
> if (!scheme)
> return NULL;
> - scheme->min_sz_region = min_sz_region;
> - scheme->max_sz_region = max_sz_region;
> - scheme->min_nr_accesses = min_nr_accesses;
> - scheme->max_nr_accesses = max_nr_accesses;
> - scheme->min_age_region = min_age_region;
> - scheme->max_age_region = max_age_region;
> + scheme->region.min_sz_region = region->min_sz_region;
> + scheme->region.max_sz_region = region->max_sz_region;
> + scheme->region.min_nr_accesses = region->min_nr_accesses;
> + scheme->region.max_nr_accesses = region->max_nr_accesses;
> + scheme->region.min_age_region = region->min_age_region;
> + scheme->region.max_age_region = region->max_age_region;
> scheme->action = action;
> scheme->stat = (struct damos_stat){};
> INIT_LIST_HEAD(&scheme->list);
> @@ -666,10 +662,10 @@ static bool __damos_valid_target(struct damon_region *r, struct damos *s)
> unsigned long sz;
>
> sz = r->ar.end - r->ar.start;
> - return s->min_sz_region <= sz && sz <= s->max_sz_region &&
> - s->min_nr_accesses <= r->nr_accesses &&
> - r->nr_accesses <= s->max_nr_accesses &&
> - s->min_age_region <= r->age && r->age <= s->max_age_region;
> + return s->region.min_sz_region <= sz && sz <= s->region.max_sz_region &&
> + s->region.min_nr_accesses <= r->nr_accesses &&
> + r->nr_accesses <= s->region.max_nr_accesses &&
> + s->region.min_age_region <= r->age && r->age <= s->region.max_age_region;
> }
>
> static bool damos_valid_target(struct damon_ctx *c, struct damon_target *t,
> diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
> index 652a94deafe3..1887d315f6d5 100644
> --- a/mm/damon/dbgfs.c
> +++ b/mm/damon/dbgfs.c
> @@ -131,9 +131,9 @@ static ssize_t sprint_schemes(struct damon_ctx *c, char *buf, ssize_t len)
> damon_for_each_scheme(s, c) {
> rc = scnprintf(&buf[written], len - written,
> "%lu %lu %u %u %u %u %d %lu %lu %lu %u %u %u %d %lu %lu %lu %lu %lu %lu %lu %lu %lu\n",
> - s->min_sz_region, s->max_sz_region,
> - s->min_nr_accesses, s->max_nr_accesses,
> - s->min_age_region, s->max_age_region,
> + s->region.min_sz_region, s->region.max_sz_region,
> + s->region.min_nr_accesses, s->region.max_nr_accesses,
> + s->region.min_age_region, s->region.max_age_region,
> damos_action_to_dbgfs_scheme_action(s->action),
> s->quota.ms, s->quota.sz,
> s->quota.reset_interval,
> @@ -221,8 +221,6 @@ static struct damos **str_to_schemes(const char *str, ssize_t len,
> struct damos *scheme, **schemes;
> const int max_nr_schemes = 256;
> int pos = 0, parsed, ret;
> - unsigned long min_sz, max_sz;
> - unsigned int min_nr_a, max_nr_a, min_age, max_age;
> unsigned int action_input;
> enum damos_action action;
>
> @@ -235,11 +233,14 @@ static struct damos **str_to_schemes(const char *str, ssize_t len,
> while (pos < len && *nr_schemes < max_nr_schemes) {
> struct damos_quota quota = {};
> struct damos_watermarks wmarks;
> + struct damos_region region = {};
>
> ret = sscanf(&str[pos],
> "%lu %lu %u %u %u %u %u %lu %lu %lu %u %u %u %u %lu %lu %lu %lu%n",
> - &min_sz, &max_sz, &min_nr_a, &max_nr_a,
> - &min_age, &max_age, &action_input, "a.ms,
> + ®ion.min_sz_region, ®ion.max_sz_region,
> + ®ion.min_nr_accesses, ®ion.max_nr_accesses,
> + ®ion.min_age_region, ®ion.max_age_region,
> + &action_input, "a.ms,
> "a.sz, "a.reset_interval,
> "a.weight_sz, "a.weight_nr_accesses,
> "a.weight_age, &wmarks.metric,
> @@ -251,7 +252,9 @@ static struct damos **str_to_schemes(const char *str, ssize_t len,
> if ((int)action < 0)
> goto fail;
>
> - if (min_sz > max_sz || min_nr_a > max_nr_a || min_age > max_age)
> + if (region.min_sz_region > region.max_sz_region ||
> + region.min_nr_accesses > region.max_nr_accesses ||
> + region.min_age_region > region.max_age_region)
> goto fail;
>
> if (wmarks.high < wmarks.mid || wmarks.high < wmarks.low ||
> @@ -259,8 +262,7 @@ static struct damos **str_to_schemes(const char *str, ssize_t len,
> goto fail;
>
> pos += parsed;
> - scheme = damon_new_scheme(min_sz, max_sz, min_nr_a, max_nr_a,
> - min_age, max_age, action, "a, &wmarks);
> + scheme = damon_new_scheme(®ion, action, "a, &wmarks);
> if (!scheme)
> goto fail;
>
> diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c
> index 9de6f00a71c5..2f798f66dc08 100644
> --- a/mm/damon/lru_sort.c
> +++ b/mm/damon/lru_sort.c
> @@ -313,13 +313,19 @@ static struct damos *damon_lru_sort_new_hot_scheme(unsigned int hot_thres)
> .weight_nr_accesses = 1,
> .weight_age = 0,
> };
> + struct damos_region region = {
> + /* Find regions having PAGE_SIZE or larger size */
> + .min_sz_region = PAGE_SIZE,
> + .max_sz_region = ULONG_MAX,
> + /* and accessed for more than the threshold */
> + .min_nr_accesses = hot_thres,
> + .max_nr_accesses = UINT_MAX,
> + /* no matter its age*/
> + .min_age_region = 0,
> + .max_age_region = UINT_MAX,
> + };
> struct damos *scheme = damon_new_scheme(
> - /* Find regions having PAGE_SIZE or larger size */
> - PAGE_SIZE, ULONG_MAX,
> - /* and accessed for more than the threshold */
> - hot_thres, UINT_MAX,
> - /* no matter its age */
> - 0, UINT_MAX,
> + ®ion,
> /* prioritize those on LRU lists, as soon as found */
> DAMOS_LRU_PRIO,
> /* under the quota. */
> @@ -354,21 +360,26 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres)
> .weight_nr_accesses = 0,
> .weight_age = 1,
> };
> - struct damos *scheme = damon_new_scheme(
> - /* Find regions having PAGE_SIZE or larger size */
> - PAGE_SIZE, ULONG_MAX,
> - /* and not accessed at all */
> - 0, 0,
> - /* for cold_thres or more micro-seconds, and */
> - cold_thres, UINT_MAX,
> + struct damos_region region = {
> + /* Find regions having PAGE_SIZE or larger size */
> + .min_sz_region = PAGE_SIZE,
> + .max_sz_region = ULONG_MAX,
> + /* and not accessed at all */
> + .min_nr_accesses = 0,
> + .max_nr_accesses = 0,
> + /* for min_age or more micro-seconds*/
> + .min_age_region = cold_thres,
> + .max_age_region = UINT_MAX,
> + };
> +
> + return damon_new_scheme(
> + ®ion,
> /* mark those as not accessed, as soon as found */
> DAMOS_LRU_DEPRIO,
> /* under the quota. */
> "a,
> /* (De)activate this according to the watermarks. */
> &wmarks);
> -
> - return scheme;
> }
>
> static int damon_lru_sort_apply_parameters(void)
> diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c
> index a7faf51b4bd4..13e3cbcce812 100644
> --- a/mm/damon/reclaim.c
> +++ b/mm/damon/reclaim.c
> @@ -284,21 +284,26 @@ static struct damos *damon_reclaim_new_scheme(void)
> .weight_nr_accesses = 0,
> .weight_age = 1
> };
> - struct damos *scheme = damon_new_scheme(
> - /* Find regions having PAGE_SIZE or larger size */
> - PAGE_SIZE, ULONG_MAX,
> - /* and not accessed at all */
> - 0, 0,
> - /* for min_age or more micro-seconds, and */
> - min_age / aggr_interval, UINT_MAX,
> + struct damos_region region = {
> + /* Find regions having PAGE_SIZE or larger size */
> + .min_sz_region = PAGE_SIZE,
> + .max_sz_region = ULONG_MAX,
> + /* and not accessed at all */
> + .min_nr_accesses = 0,
> + .max_nr_accesses = 0,
> + /* for min_age or more micro-seconds*/
> + .min_age_region = min_age / aggr_interval,
> + .max_age_region = UINT_MAX,
> + };
> +
> + return damon_new_scheme(
> + ®ion,
> /* page out those, as soon as found */
> DAMOS_PAGEOUT,
> /* under the quota. */
> "a,
> /* (De)activate this according to the watermarks. */
> &wmarks);
> -
> - return scheme;
> }
>
> static int damon_reclaim_apply_parameters(void)
> diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c
> index fe6c6870cf86..9abb45f9127e 100644
> --- a/mm/damon/sysfs.c
> +++ b/mm/damon/sysfs.c
> @@ -2279,11 +2279,16 @@ static struct damos *damon_sysfs_mk_scheme(
> .mid = sysfs_wmarks->mid,
> .low = sysfs_wmarks->low,
> };
> + struct damos_region region = {
> + .min_sz_region = pattern->sz->min,
> + .max_sz_region = pattern->sz->max,
> + .min_nr_accesses = pattern->nr_accesses->min,
> + .max_nr_accesses = pattern->nr_accesses->max,
> + .min_age_region = pattern->age->min,
> + .max_age_region = pattern->age->max,
> + };
>
> - return damon_new_scheme(pattern->sz->min, pattern->sz->max,
> - pattern->nr_accesses->min, pattern->nr_accesses->max,
> - pattern->age->min, pattern->age->max,
> - sysfs_scheme->action, "a, &wmarks);
> + return damon_new_scheme(®ion, sysfs_scheme->action, "a, &wmarks);
> }
>
> static int damon_sysfs_set_schemes(struct damon_ctx *ctx,
> --
> 2.25.1
Thanks,
SJ
