Commit 45b8212f authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton

mm/damon/lru_sort: use quotas param generator

This commit makes DAMON_LRU_SORT to generate the module parameters for
DAMOS watermarks using the generator macro to simplify the code and reduce
duplicates.

Link: https://lkml.kernel.org/r/20220913174449.50645-22-sj@kernel.orgSigned-off-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a9d57c73
...@@ -65,30 +65,17 @@ module_param(hot_thres_access_freq, ulong, 0600); ...@@ -65,30 +65,17 @@ module_param(hot_thres_access_freq, ulong, 0600);
static unsigned long cold_min_age __read_mostly = 120000000; static unsigned long cold_min_age __read_mostly = 120000000;
module_param(cold_min_age, ulong, 0600); module_param(cold_min_age, ulong, 0600);
/* static struct damos_quota damon_lru_sort_quota = {
* Limit of time for trying the LRU lists sorting in milliseconds. /* Use up to 10 ms per 1 sec, by default */
* .ms = 10,
* DAMON_LRU_SORT tries to use only up to this time within a time window .sz = 0,
* (quota_reset_interval_ms) for trying LRU lists sorting. This can be used .reset_interval = 1000,
* for limiting CPU consumption of DAMON_LRU_SORT. If the value is zero, the /* Within the quota, mark hotter regions accessed first. */
* limit is disabled. .weight_sz = 0,
* .weight_nr_accesses = 1,
* 10 ms by default. .weight_age = 0,
*/ };
static unsigned long quota_ms __read_mostly = 10; DEFINE_DAMON_MODULES_DAMOS_TIME_QUOTA(damon_lru_sort_quota);
module_param(quota_ms, ulong, 0600);
/*
* The time quota charge reset interval in milliseconds.
*
* The charge reset interval for the quota of time (quota_ms). That is,
* DAMON_LRU_SORT does not try LRU-lists sorting for more than quota_ms
* milliseconds or quota_sz bytes within quota_reset_interval_ms milliseconds.
*
* 1 second by default.
*/
static unsigned long quota_reset_interval_ms __read_mostly = 1000;
module_param(quota_reset_interval_ms, ulong, 0600);
struct damos_watermarks damon_lru_sort_wmarks = { struct damos_watermarks damon_lru_sort_wmarks = {
.metric = DAMOS_WMARK_FREE_MEM_RATE, .metric = DAMOS_WMARK_FREE_MEM_RATE,
...@@ -162,19 +149,10 @@ static struct damos *damon_lru_sort_new_hot_scheme(unsigned int hot_thres) ...@@ -162,19 +149,10 @@ static struct damos *damon_lru_sort_new_hot_scheme(unsigned int hot_thres)
.min_age_region = 0, .min_age_region = 0,
.max_age_region = UINT_MAX, .max_age_region = UINT_MAX,
}; };
struct damos_quota quota = { struct damos_quota quota = damon_lru_sort_quota;
/*
* Do not try LRU-lists sorting of hot pages for more than half /* Use half of total quota for hot pages sorting */
* of quota_ms milliseconds within quota_reset_interval_ms. quota.ms = quota.ms / 2;
*/
.ms = quota_ms / 2,
.sz = 0,
.reset_interval = quota_reset_interval_ms,
/* Within the quota, mark hotter regions accessed first. */
.weight_sz = 0,
.weight_nr_accesses = 1,
.weight_age = 0,
};
return damon_new_scheme( return damon_new_scheme(
&pattern, &pattern,
...@@ -200,20 +178,10 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres) ...@@ -200,20 +178,10 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres)
.min_age_region = cold_thres, .min_age_region = cold_thres,
.max_age_region = UINT_MAX, .max_age_region = UINT_MAX,
}; };
struct damos_quota quota = { struct damos_quota quota = damon_lru_sort_quota;
/*
* Do not try LRU-lists sorting of cold pages for more than /* Use half of total quota for cold pages sorting */
* half of quota_ms milliseconds within quota.ms = quota.ms / 2;
* quota_reset_interval_ms.
*/
.ms = quota_ms / 2,
.sz = 0,
.reset_interval = quota_reset_interval_ms,
/* Within the quota, mark colder regions not accessed first. */
.weight_sz = 0,
.weight_nr_accesses = 0,
.weight_age = 1,
};
return damon_new_scheme( return damon_new_scheme(
&pattern, &pattern,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment