mm-damon-lru_sort-use-stat-generator.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/lru_sort: use stat generator
has been removed from the -mm tree. Its filename was
mm-damon-lru_sort-use-stat-generator.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 stat generator
Date: Tue, 13 Sep 2022 17:44:44 +0000
This commit makes DAMON_LRU_SORT to generate the module parameters for DAMOS statistics using the generator macro to simplify the code and reduce duplicates.
---
mm/damon/lru_sort.c | 85 ++++++------------------------------------ 1 file changed, 13 insertions(+), 72 deletions(-)
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-lru_sort-use-stat-generator +13 -72
@@ -135,65 +135,15 @@ module_param(monitor_region_end, ulong,static int kdamond_pid__read_mostly =-1 ;module_param (kdamond_pid, int,0400 ); -/* -* Number of hot memory regions that tried to be LRU-sorted. -*/ -static unsigned long nr_lru_sort_tried_hot_regions__read_mostly ; -module_param (nr_lru_sort_tried_hot_regions, ulong,0400 ); - -/* -* Total bytes of hot memory regions that tried to be LRU-sorted. -*/ -static unsigned long bytes_lru_sort_tried_hot_regions__read_mostly ; -module_param (bytes_lru_sort_tried_hot_regions, ulong,0400 ); - -/* -* Number of hot memory regions that successfully be LRU-sorted. -*/ -static unsigned long nr_lru_sorted_hot_regions__read_mostly ; -module_param (nr_lru_sorted_hot_regions, ulong,0400 ); - -/* -* Total bytes of hot memory regions that successfully be LRU-sorted. -*/ -static unsigned long bytes_lru_sorted_hot_regions__read_mostly ; -module_param (bytes_lru_sorted_hot_regions, ulong,0400 ); - -/* -* Number of times that the time quota limit for hot regions have exceeded -*/ -static unsigned long nr_hot_quota_exceeds__read_mostly ; -module_param (nr_hot_quota_exceeds, ulong,0400 ); - -/* -* Number of cold memory regions that tried to be LRU-sorted. -*/ -static unsigned long nr_lru_sort_tried_cold_regions__read_mostly ; -module_param (nr_lru_sort_tried_cold_regions, ulong,0400 ); - -/* -* Total bytes of cold memory regions that tried to be LRU-sorted. -*/ -static unsigned long bytes_lru_sort_tried_cold_regions__read_mostly ; -module_param (bytes_lru_sort_tried_cold_regions, ulong,0400 ); - -/* -* Number of cold memory regions that successfully be LRU-sorted. -*/ -static unsigned long nr_lru_sorted_cold_regions__read_mostly ; -module_param (nr_lru_sorted_cold_regions, ulong,0400 ); - -/* -* Total bytes of cold memory regions that successfully be LRU-sorted. -*/ -static unsigned long bytes_lru_sorted_cold_regions__read_mostly ; -module_param (bytes_lru_sorted_cold_regions, ulong,0400 ); - -/* -* Number of times that the time quota limit for cold regions have exceeded -*/ -static unsigned long nr_cold_quota_exceeds__read_mostly ; -module_param (nr_cold_quota_exceeds, ulong,0400 ); +static struct damos_stat damon_lru_sort_hot_stat; +DEFINE_DAMON_MODULES_DAMOS_STATS_PARAMS (damon_lru_sort_hot_stat, + lru_sort_tried_hot_regions, lru_sorted_hot_regions, + hot_quota_exceeds); + +static struct damos_stat damon_lru_sort_cold_stat; +DEFINE_DAMON_MODULES_DAMOS_STATS_PARAMS (damon_lru_sort_cold_stat, + lru_sort_tried_cold_regions, lru_sorted_cold_regions, + cold_quota_exceeds);static struct damon_ctx *ctx;static struct damon_target *target;
@@ -397,19 +347,10 @@ static int damon_lru_sort_after_aggregat/* update the stats parameter */ damon_for_each_scheme (s, c) { -if (s->action ==DAMOS_LRU_PRIO ) { - nr_lru_sort_tried_hot_regions = s->stat.nr_tried; - bytes_lru_sort_tried_hot_regions = s->stat.sz_tried; - nr_lru_sorted_hot_regions = s->stat.nr_applied; - bytes_lru_sorted_hot_regions = s->stat.sz_applied; - nr_hot_quota_exceeds = s->stat.qt_exceeds; - }else if (s->action ==DAMOS_LRU_DEPRIO ) { - nr_lru_sort_tried_cold_regions = s->stat.nr_tried; - bytes_lru_sort_tried_cold_regions = s->stat.sz_tried; - nr_lru_sorted_cold_regions = s->stat.nr_applied; - bytes_lru_sorted_cold_regions = s->stat.sz_applied; - nr_cold_quota_exceeds = s->stat.qt_exceeds; - } +if (s->action ==DAMOS_LRU_PRIO ) + damon_lru_sort_hot_stat = s->stat; +else if (s->action ==DAMOS_LRU_DEPRIO ) + damon_lru_sort_cold_stat = s->stat; }return damon_lru_sort_handle_commit_inputs ();
_
Patches currently in -mm which might be from [email protected] are
mm-damon-core-initialize-damon_target-list-in-damon_new_target.patch