mm-damon-lru_sort-use-struct-damon_attrs-for-storing-parameters-for-it.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/lru_sort: use 'struct damon_attrs' for storing parameters for it
has been removed from the -mm tree. Its filename was
mm-damon-lru_sort-use-struct-damon_attrs-for-storing-parameters-for-it.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/lru_sort: use 'struct damon_attrs' for storing parameters for it
Date: Tue, 13 Sep 2022 17:44:35 +0000
DAMON_LRU_SORT receives monitoring attributes by parameters one by one to separate variables, and then combines those into 'struct damon_attrs'. This commit makes the module directly stores the parameter values to a static 'struct damon_attrs' variable and use it to simplify the code.
---
mm/damon/lru_sort.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-lru_sort-use-struct-damon_attrs-for-storing-parameters-for-it +21 -19
@@ -127,14 +127,22 @@ module_param(wmarks_mid, ulong, 0600);static unsigned long wmarks_low__read_mostly =50 ;module_param (wmarks_low, ulong,0600 ); +static struct damon_attrs damon_lru_sort_mon_attrs = { + .sample_interval =5000 , + .aggr_interval =100000 , + .ops_update_interval =0 , + .min_nr_regions =10 , + .max_nr_regions =1000 , +}; +/* * Sampling interval for the monitoring in microseconds. * * The sampling interval of DAMON for the hot/cold memory monitoring. Please * refer to the DAMON documentation for more detail. 5 ms by default. */ -static unsigned long sample_interval__read_mostly =5000 ; -module_param (sample_interval, ulong,0600 ); +module_param_named (sample_interval, damon_lru_sort_mon_attrs.sample_interval, + ulong,0600 );/* * Aggregation interval for the monitoring in microseconds.
@@ -142,8 +150,8 @@ module_param(sample_interval, ulong, 060* The aggregation interval of DAMON for the hot/cold memory monitoring. * Please refer to the DAMON documentation for more detail. 100 ms by default. */ -static unsigned long aggr_interval__read_mostly =100000 ; -module_param (aggr_interval, ulong,0600 ); +module_param_named (aggr_interval, damon_lru_sort_mon_attrs.aggr_interval, ulong, +0600 );/* * Minimum number of monitoring regions.
@@ -153,8 +161,8 @@ module_param(aggr_interval, ulong, 0600)* But, setting this too high could result in increased monitoring overhead. * Please refer to the DAMON documentation for more detail. 10 by default. */ -static unsigned long min_nr_regions__read_mostly =10 ; -module_param (min_nr_regions, ulong,0600 ); +module_param_named (min_nr_regions, damon_lru_sort_mon_attrs.min_nr_regions, + ulong,0600 );/* * Maximum number of monitoring regions.
@@ -164,8 +172,8 @@ module_param(min_nr_regions, ulong, 0600* However, setting this too low could result in bad monitoring quality. * Please refer to the DAMON documentation for more detail. 1000 by default. */ -static unsigned long max_nr_regions__read_mostly =1000 ; -module_param (max_nr_regions, ulong,0600 ); +module_param_named (max_nr_regions, damon_lru_sort_mon_attrs.max_nr_regions, + ulong,0600 );/* * Start of the target memory region in physical address.
@@ -350,25 +358,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, &attrs); + err =damon_set_attrs (ctx, &damon_lru_sort_mon_attrs);if (err)return err;/* aggr_interval / sample_interval is the maximum nr_accesses */ - hot_thres = aggr_interval / sample_interval * hot_thres_access_freq / -1000 ; + hot_thres = damon_lru_sort_mon_attrs.aggr_interval / + damon_lru_sort_mon_attrs.sample_interval * + hot_thres_access_freq /1000 ; scheme =damon_lru_sort_new_hot_scheme (hot_thres);if (!scheme)return -ENOMEM ;
@@ -376,7 +378,7 @@ static int damon_lru_sort_apply_parameteif (err)return err; - cold_thres = cold_min_age / aggr_interval; + cold_thres = cold_min_age / damon_lru_sort_mon_attrs.aggr_interval; scheme =damon_lru_sort_new_cold_scheme (cold_thres);if (!scheme)return -ENOMEM ;
_
Patches currently in -mm which might be from [email protected] are
mm-damon-core-initialize-damon_target-list-in-damon_new_target.patch