@@ -257,18 +257,13 @@ module_param(nr_cold_quota_exceeds, ulong, 0400);
static 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;
+ struct damon_addr_range *r = arg;
- if (a->end - a->start < resource_size(res)) {
- a->start = res->start;
- a->end = res->end;
+ if (r->end - r->start < resource_size(res)) {
+ r->start = res->start;
+ r->end = res->end;
}
return 0;
}
@@ -277,16 +272,12 @@ static int walk_system_ram(struct resource *res, void *arg)
* 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)
+static bool get_monitoring_region(struct damon_addr_range *range)
{
- struct damon_lru_sort_ram_walk_arg arg = {};
-
- walk_system_ram_res(0, ULONG_MAX, &arg, walk_system_ram);
- if (arg.end <= arg.start)
+ walk_system_ram_res(0, ULONG_MAX, range, walk_system_ram);
+ if (range->end <= range->start)
return false;
- *start = arg.start;
- *end = arg.end;
return true;
}
@@ -380,9 +371,12 @@ static int damon_lru_sort_apply_parameters(void)
if (monitor_region_start > monitor_region_end)
return -EINVAL;
- if (!monitor_region_start && !monitor_region_end &&
- !get_monitoring_region(&monitor_region_start,
- &monitor_region_end))
+ if (!monitor_region_end)
+ return -EINVAL;
+
+ addr_range.start = monitor_region_start;
+ addr_range.end = monitor_region_end;
+ if (!get_monitoring_region(&addr_range))
return -EINVAL;
err = damon_set_attrs(ctx, sample_interval, aggr_interval, 0,
@@ -408,8 +402,6 @@ static int damon_lru_sort_apply_parameters(void)
return -ENOMEM;
damon_add_scheme(ctx, scheme);
- addr_range.start = monitor_region_start;
- addr_range.end = monitor_region_end;
return damon_set_regions(target, &addr_range, 1);
}
The struct of 'damon_lru_sort_ram_walk_arg' is the same with struct of 'damon_addr_range', so, there no need to redefine it, just use struct of 'damon_addr_range' instead. Signed-off-by: Xin Hao <xhao@linux.alibaba.com> --- mm/damon/lru_sort.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) -- 2.27.0