mm-damon-introduce-struct-damos_access_pattern.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon: introduce struct damos_access_pattern
has been removed from the -mm tree. Its filename was
mm-damon-introduce-struct-damos_access_pattern.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: Yajun Deng <[email protected]>
Subject: mm/damon: introduce struct damos_access_pattern
Date: Thu, 8 Sep 2022 19:14:43 +0000
damon_new_scheme() has too many parameters, so introduce struct damos_access_pattern to simplify it.
In additon, we can't use a bpf trace kprobe that has more than 5 parameters.
---
include/linux/damon.h | 37 +++++++++++++++++--------------- mm/damon/core.c | 31 +++++++++++++------------- mm/damon/dbgfs.c | 27 ++++++++++++++--------- mm/damon/lru_sort.c | 46 ++++++++++++++++++++++++---------------- mm/damon/reclaim.c | 23 ++++++++++++-------- mm/damon/sysfs.c | 17 ++++++++++---- 6 files changed, 106 insertions(+), 75 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-introduce-struct-damos_access_pattern +20 -17
@@ -216,13 +216,26 @@ struct damos_stat { };/** -* struct damos - Represents a Data Access Monitoring-based Operation Scheme. +* struct damos_access_pattern - Target access pattern of the given scheme. * @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_access_pattern { +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 - Represents a Data Access Monitoring-based Operation Scheme. +* @pattern: Access pattern of target regions. * @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 +243,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. +* &pattern and applies &action to those. To avoid consuming 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 +259,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_access_pattern pattern;enum damos_action action;struct damos_quota quota;struct damos_watermarks wmarks;
@@ -509,12 +515,9 @@ void damon_destroy_region(struct damon_rint 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_access_pattern *pattern, +enum damos_action action,struct damos_quota *quota, +struct damos_watermarks *wmarks);void damon_add_scheme (struct damon_ctx *ctx,struct damos *s);void damon_destroy_scheme (struct damos *s);
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-introduce-struct-damos_access_pattern +15 -16
@@ -231,24 +231,21 @@ int damon_set_regions(struct damon_targereturn 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_access_pattern *pattern, +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->pattern.min_sz_region = pattern->min_sz_region; + scheme->pattern.max_sz_region = pattern->max_sz_region; + scheme->pattern.min_nr_accesses = pattern->min_nr_accesses; + scheme->pattern.max_nr_accesses = pattern->max_nr_accesses; + scheme->pattern.min_age_region = pattern->min_age_region; + scheme->pattern.max_age_region = pattern->max_age_region; scheme->action = action; scheme->stat = (struct damos_stat ){};INIT_LIST_HEAD (&scheme->list);
@@ -667,10 +664,12 @@ static bool __damos_valid_target(structunsigned 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->pattern.min_sz_region <= sz && + sz <= s->pattern.max_sz_region && + s->pattern.min_nr_accesses <= r->nr_accesses && + r->nr_accesses <= s->pattern.max_nr_accesses && + s->pattern.min_age_region <= r->age && + r->age <= s->pattern.max_age_region; } static bool damos_valid_target(struct damon_ctx *c, struct damon_target *t,
mm/damon/dbgfs.c renamed from mm/damon/dbgfs.c~mm-damon-introduce-struct-damos_access_pattern +17 -10
@@ -131,9 +131,12 @@ static ssize_t sprint_schemes(struct damdamon_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->pattern.min_sz_region, + s->pattern.max_sz_region, + s->pattern.min_nr_accesses, + s->pattern.max_nr_accesses, + s->pattern.min_age_region, + s->pattern.max_age_region, damos_action_to_dbgfs_scheme_action(s->action), s->quota.ms, s->quota.sz, s->quota.reset_interval,
@@ -221,8 +224,6 @@ static struct damos **str_to_schemes(construct 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;
@@ -233,13 +234,18 @@ static struct damos **str_to_schemes(con *nr_schemes =0 ;while (pos < len && *nr_schemes < max_nr_schemes) { +struct damos_access_pattern pattern = {};struct damos_quota quota = {};struct damos_watermarks wmarks; 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, + &pattern.min_sz_region, &pattern.max_sz_region, + &pattern.min_nr_accesses, + &pattern.max_nr_accesses, + &pattern.min_age_region, + &pattern.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 +257,9 @@ static struct damos **str_to_schemes(conif ((int )action <0 ) goto fail; -if (min_sz > max_sz || min_nr_a > max_nr_a || min_age > max_age) +if (pattern.min_sz_region > pattern.max_sz_region || + pattern.min_nr_accesses > pattern.max_nr_accesses || + pattern.min_age_region > pattern.max_age_region) goto fail; if (wmarks.high < wmarks.mid || wmarks.high < wmarks.low ||
@@ -259,8 +267,7 @@ static struct damos **str_to_schemes(con 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 (&pattern, action, "a, &wmarks);if (!scheme) goto fail;
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-introduce-struct-damos_access_pattern +28 -18
81 lines not on this page · raw message
mm/damon/reclaim.c renamed from mm/damon/reclaim.c~mm-damon-introduce-struct-damos_access_pattern +14 -9
@@ -264,6 +264,17 @@ static bool get_monitoring_region(unsignstatic struct damos *damon_reclaim_new_scheme (void ) { +struct damos_access_pattern pattern = { +/* 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 , + };struct damos_watermarks wmarks = { .metric =DAMOS_WMARK_FREE_MEM_RATE , .interval = wmarks_interval,
@@ -284,21 +295,15 @@ static struct damos *damon_reclaim_new_s .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 , + +return damon_new_scheme ( + &pattern,/* 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 )
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-introduce-struct-damos_access_pattern +12 -5
@@ -2259,11 +2259,20 @@ static int damon_sysfs_set_targets(strucstatic struct damos *damon_sysfs_mk_scheme (struct damon_sysfs_scheme *sysfs_scheme) { -struct damon_sysfs_access_pattern *pattern = +struct damon_sysfs_access_pattern *access_pattern = sysfs_scheme->access_pattern;struct damon_sysfs_quotas *sysfs_quotas = sysfs_scheme->quotas;struct damon_sysfs_weights *sysfs_weights = sysfs_quotas->weights;struct damon_sysfs_watermarks *sysfs_wmarks = sysfs_scheme->watermarks; + +struct damos_access_pattern pattern = { + .min_sz_region = access_pattern->sz->min, + .max_sz_region = access_pattern->sz->max, + .min_nr_accesses = access_pattern->nr_accesses->min, + .max_nr_accesses = access_pattern->nr_accesses->max, + .min_age_region = access_pattern->age->min, + .max_age_region = access_pattern->age->max, + };struct damos_quota quota = { .ms = sysfs_quotas->ms, .sz = sysfs_quotas->sz,
@@ -2280,10 +2289,8 @@ static struct damos *damon_sysfs_mk_sche .low = sysfs_wmarks->low, }; -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 (&pattern, sysfs_scheme->action, "a, + &wmarks); } static int damon_sysfs_set_schemes(struct damon_ctx *ctx,
_
Patches currently in -mm which might be from [email protected] are