mm-damon-lru_sort-use-watermarks-parameters-generator-macro.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/lru_sort: use watermarks parameters generator macro
has been removed from the -mm tree. Its filename was
mm-damon-lru_sort-use-watermarks-parameters-generator-macro.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 watermarks parameters generator macro
Date: Tue, 13 Sep 2022 17:44:40 +0000
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.
---
mm/damon/lru_sort.c | 64 +++++------------------------------- mm/damon/modules-common.h | 4 +- 2 files changed, 12 insertions(+), 56 deletions(-)
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-lru_sort-use-watermarks-parameters-generator-macro +10 -54
@@ -90,44 +90,14 @@ module_param(quota_ms, ulong, 0600);static unsigned long quota_reset_interval_ms__read_mostly =1000 ;module_param (quota_reset_interval_ms, ulong,0600 ); -/* -* The watermarks check time interval in microseconds. -* -* Minimal time to wait before checking the watermarks, when DAMON_LRU_SORT is -* enabled but inactive due to its watermarks rule. 5 seconds by default. -*/ -static unsigned long wmarks_interval__read_mostly =5000000 ; -module_param (wmarks_interval, ulong,0600 ); - -/* -* Free memory rate (per thousand) for the high watermark. -* -* If free memory of the system in bytes per thousand bytes is higher than -* this, DAMON_LRU_SORT becomes inactive, so it does nothing but periodically -* checks the watermarks. 200 (20%) by default. -*/ -static unsigned long wmarks_high__read_mostly =200 ; -module_param (wmarks_high, ulong,0600 ); - -/* -* Free memory rate (per thousand) for the middle watermark. -* -* If free memory of the system in bytes per thousand bytes is between this and -* the low watermark, DAMON_LRU_SORT becomes active, so starts the monitoring -* and the LRU-lists sorting. 150 (15%) by default. -*/ -static unsigned long wmarks_mid__read_mostly =150 ; -module_param (wmarks_mid, ulong,0600 ); - -/* -* Free memory rate (per thousand) for the low watermark. -* -* If free memory of the system in bytes per thousand bytes is lower than this, -* DAMON_LRU_SORT becomes inactive, so it does nothing but periodically checks -* the watermarks. 50 (5%) by default. -*/ -static unsigned long wmarks_low__read_mostly =50 ; -module_param (wmarks_low, ulong,0600 ); +struct damos_watermarks damon_lru_sort_wmarks = { + .metric =DAMOS_WMARK_FREE_MEM_RATE , + .interval =5000000 ,/* 5 seconds */ + .high =200 ,/* 20 percent */ + .mid =150 ,/* 15 percent */ + .low =50 ,/* 5 percent */ +}; +DEFINE_DAMON_MODULES_WMARKS_PARAMS (damon_lru_sort_wmarks);static struct damon_attrs damon_lru_sort_mon_attrs = { .sample_interval =5000 ,/* 5 ms */
@@ -242,13 +212,6 @@ static struct damos *damon_lru_sort_new_ .min_age_region = 0, .max_age_region = UINT_MAX, }; -struct damos_watermarks wmarks = { - .metric =DAMOS_WMARK_FREE_MEM_RATE , - .interval = wmarks_interval, - .high = wmarks_high, - .mid = wmarks_mid, - .low = wmarks_low, - };struct damos_quota quota = {/* * Do not try LRU-lists sorting of hot pages for more than half
@@ -270,7 +233,7 @@ static struct damos *damon_lru_sort_new_/* under the quota. */ "a,/* (De)activate this according to the watermarks. */ - &wmarks); + &damon_lru_sort_wmarks); }/* Create a DAMON-based operation scheme for cold memory regions */
@@ -287,13 +250,6 @@ static struct damos *damon_lru_sort_new_ .min_age_region = cold_thres, .max_age_region = UINT_MAX, }; -struct damos_watermarks wmarks = { - .metric =DAMOS_WMARK_FREE_MEM_RATE , - .interval = wmarks_interval, - .high = wmarks_high, - .mid = wmarks_mid, - .low = wmarks_low, - };struct damos_quota quota = {/* * Do not try LRU-lists sorting of cold pages for more than
@@ -316,7 +272,7 @@ static struct damos *damon_lru_sort_new_/* under the quota. */ "a,/* (De)activate this according to the watermarks. */ - &wmarks); + &damon_lru_sort_wmarks); }static int damon_lru_sort_apply_parameters (void )
mm/damon/modules-common.h renamed from mm/damon/modules-common.h~mm-damon-lru_sort-use-watermarks-parameters-generator-macro +2 -2
@@ -18,8 +18,8 @@ 0600);#define DEFINE_DAMON_MODULES_WMARKS_PARAMS (wmarks) \ - module_param_named(wmarks_interval, wmarks->interval, ulong, \ + module_param_named(wmarks_interval, wmarks.interval, ulong, \ 0600); \ module_param_named(wmarks_high, wmarks.high, ulong, 0600); \ module_param_named(wmarks_mid, wmarks.mid, ulong, 0600); \ - module_param_named(wmarks_low, wmarks.lowulong, 0600); + module_param_named(wmarks_low, wmarks.low, ulong, 0600);
_
Patches currently in -mm which might be from [email protected] are
mm-damon-core-initialize-damon_target-list-in-damon_new_target.patch