mm/damon/sysfs: reuse damon_set_regions() for regions setting

'damon_set_regions()' is general enough so that it can also be used for
only creating regions.  This commit makes DAMON sysfs interface to reuse
the function rather keeping two implementations for a same purpose.

Link: https://lkml.kernel.org/r/20220429160606.127307-9-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
SeongJae Park 2022-05-09 18:20:55 -07:00 committed by Andrew Morton
parent 74bd8b7d2f
commit 97d482f459
1 changed files with 18 additions and 15 deletions

View File

@ -2096,28 +2096,31 @@ static void damon_sysfs_destroy_targets(struct damon_ctx *ctx)
static int damon_sysfs_set_regions(struct damon_target *t, static int damon_sysfs_set_regions(struct damon_target *t,
struct damon_sysfs_regions *sysfs_regions) struct damon_sysfs_regions *sysfs_regions)
{ {
int i; struct damon_addr_range *ranges = kmalloc_array(sysfs_regions->nr,
sizeof(*ranges), GFP_KERNEL | __GFP_NOWARN);
int i, err = -EINVAL;
if (!ranges)
return -ENOMEM;
for (i = 0; i < sysfs_regions->nr; i++) { for (i = 0; i < sysfs_regions->nr; i++) {
struct damon_sysfs_region *sys_region = struct damon_sysfs_region *sys_region =
sysfs_regions->regions_arr[i]; sysfs_regions->regions_arr[i];
struct damon_region *prev, *r;
if (sys_region->start > sys_region->end) if (sys_region->start > sys_region->end)
return -EINVAL; goto out;
r = damon_new_region(sys_region->start, sys_region->end);
if (!r) ranges[i].start = sys_region->start;
return -ENOMEM; ranges[i].end = sys_region->end;
damon_add_region(r, t); if (i == 0)
if (damon_nr_regions(t) > 1) { continue;
prev = damon_prev_region(r); if (ranges[i - 1].end > ranges[i].start)
if (prev->ar.end > r->ar.start) { goto out;
damon_destroy_region(r, t);
return -EINVAL;
}
}
} }
return 0; err = damon_set_regions(t, ranges, sysfs_regions->nr);
out:
kfree(ranges);
return err;
} }
static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target,