mm-damon-remove-duplicate-get_monitoring_region-definitions.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon: remove duplicate get_monitoring_region() definitions
has been removed from the -mm tree. Its filename was
mm-damon-remove-duplicate-get_monitoring_region-definitions.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: Xin Hao <[email protected]>
Subject: mm/damon: remove duplicate get_monitoring_region() definitions
Date: Fri, 9 Sep 2022 21:36:06 +0000
In lru_sort.c and reclaim.c, they are all defining get_monitoring_region() function, there is no need to define it separately.
As 'get_monitoring_region()' is not a 'static' function anymore, we try to use a prefix to distinguish with other functions, so there rename it to 'damon_find_biggest_system_ram'.
---
include/linux/damon.h | 2 ++ mm/damon/core.c | 40 ++++++++++++++++++++++++++++++++++++++++ mm/damon/lru_sort.c | 37 ++----------------------------------- mm/damon/reclaim.c | 37 ++----------------------------------- 4 files changed, 46 insertions(+), 70 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-remove-duplicate-get_monitoring_region-definitions +2 -0
@@ -549,6 +549,8 @@ static inline bool damon_target_has_pid(int damon_start (struct damon_ctx **ctxs,int nr_ctxs,bool exclusive);int damon_stop (struct damon_ctx **ctxs,int nr_ctxs); +bool damon_find_biggest_system_ram (unsigned long *start,unsigned long *end); +#endif /* CONFIG_DAMON */ #endif /* _DAMON_H */
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-remove-duplicate-get_monitoring_region-definitions +40 -0
@@ -1245,4 +1245,44 @@ static int kdamond_fn(void *data)return 0 ; } +/* +* struct damon_system_ram_region - System RAM resource address region of +* [@start, @end). +* @start: Start address of the region (inclusive). +* @end: End address of the region (exclusive). +*/ +struct damon_system_ram_region { +unsigned long start; +unsigned long end; +}; + +static int walk_system_ram (struct resource *res,void *arg) +{ +struct damon_system_ram_region *a = arg; + +if (a->end - a->start <resource_size (res)) { + a->start = res->start; + a->end = res->end; + } +return 0 ; +} + +/* +* Find biggest 'System RAM' resource and store its start and end address in +* @start and @end, respectively. If no System RAM is found, returns false. +*/ +bool damon_find_biggest_system_ram (unsigned long *start,unsigned long *end) + +{ +struct damon_system_ram_region arg = {}; + +walk_system_ram_res (0 ,ULONG_MAX , &arg, walk_system_ram); +if (arg.end <= arg.start) +return false; + + *start = arg.start; + *end = arg.end; +return true; +} +#include "core-test.h"
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-remove-duplicate-get_monitoring_region-definitions +2 -35
@@ -257,39 +257,6 @@ module_param(nr_cold_quota_exceeds, ulonstatic struct damon_ctx *ctx;static struct damon_target *target; -struct damon_lru_sort_ram_walk_arg { -unsigned long start; -unsigned long end; -}; - -static int walk_system_ram (struct resource *res,void *arg) -{ -struct damon_lru_sort_ram_walk_arg *a = arg; - -if (a->end - a->start <resource_size (res)) { - a->start = res->start; - a->end = res->end; - } -return 0 ; -} - -/* -* Find biggest 'System RAM' resource and store its start and end address in -* @start and @end, respectively. If no System RAM is found, returns false. -*/ -static bool get_monitoring_region (unsigned long *start,unsigned long *end) -{ -struct damon_lru_sort_ram_walk_arg arg = {}; - -walk_system_ram_res (0 ,ULONG_MAX , &arg, walk_system_ram); -if (arg.end <= arg.start) -return false; - - *start = arg.start; - *end = arg.end; -return true; -} -/* Create a DAMON-based operation scheme for hot memory regions */ static struct damos *damon_lru_sort_new_hot_scheme (unsigned int hot_thres) {
@@ -414,8 +381,8 @@ static int damon_lru_sort_apply_parameteif (monitor_region_start > monitor_region_end)return -EINVAL ;if (!monitor_region_start && !monitor_region_end && - !get_monitoring_region (&monitor_region_start, - &monitor_region_end)) + !damon_find_biggest_system_ram (&monitor_region_start, + &monitor_region_end))return -EINVAL ; addr_range.start = monitor_region_start; addr_range.end = monitor_region_end;
mm/damon/reclaim.c renamed from mm/damon/reclaim.c~mm-damon-remove-duplicate-get_monitoring_region-definitions +2 -35
@@ -229,39 +229,6 @@ module_param(nr_quota_exceeds, ulong, 04static struct damon_ctx *ctx;static struct damon_target *target; -struct damon_reclaim_ram_walk_arg { -unsigned long start; -unsigned long end; -}; - -static int walk_system_ram (struct resource *res,void *arg) -{ -struct damon_reclaim_ram_walk_arg *a = arg; - -if (a->end - a->start <resource_size (res)) { - a->start = res->start; - a->end = res->end; - } -return 0 ; -} - -/* -* Find biggest 'System RAM' resource and store its start and end address in -* @start and @end, respectively. If no System RAM is found, returns false. -*/ -static bool get_monitoring_region (unsigned long *start,unsigned long *end) -{ -struct damon_reclaim_ram_walk_arg arg = {}; - -walk_system_ram_res (0 ,ULONG_MAX , &arg, walk_system_ram); -if (arg.end <= arg.start) -return false; - - *start = arg.start; - *end = arg.end; -return true; -} -static struct damos *damon_reclaim_new_scheme (void ) {struct damos_access_pattern pattern = {
@@ -328,8 +295,8 @@ static int damon_reclaim_apply_parameterif (monitor_region_start > monitor_region_end)return -EINVAL ;if (!monitor_region_start && !monitor_region_end && - !get_monitoring_region (&monitor_region_start, - &monitor_region_end)) + !damon_find_biggest_system_ram (&monitor_region_start, + &monitor_region_end))return -EINVAL ; addr_range.start = monitor_region_start; addr_range.end = monitor_region_end;
_
Patches currently in -mm which might be from [email protected] are
mm-damon-move-sz_damon_region-to-damon_sz_region.patch mm-damon-use-damon_sz_region-in-appropriate-place.patch