The patch titled Subject: mm/damon/sysfs: reuse damon_set_regions() for regions setting has been added to the -mm mm-unstable branch. Its filename is mm-damon-sysfs-reuse-damon_set_regions-for-regions-setting.patch This patch should soon appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: SeongJae Park <sj@xxxxxxxxxx> Subject: 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@xxxxxxxxxx Signed-off-by: SeongJae Park <sj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/damon/sysfs.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) --- a/mm/damon/sysfs.c~mm-damon-sysfs-reuse-damon_set_regions-for-regions-setting +++ a/mm/damon/sysfs.c @@ -2095,28 +2095,31 @@ static void damon_sysfs_destroy_targets( static int damon_sysfs_set_regions(struct damon_target *t, 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++) { struct damon_sysfs_region *sys_region = sysfs_regions->regions_arr[i]; - struct damon_region *prev, *r; if (sys_region->start > sys_region->end) - return -EINVAL; - r = damon_new_region(sys_region->start, sys_region->end); - if (!r) - return -ENOMEM; - damon_add_region(r, t); - if (damon_nr_regions(t) > 1) { - prev = damon_prev_region(r); - if (prev->ar.end > r->ar.start) { - damon_destroy_region(r, t); - return -EINVAL; - } - } + goto out; + + ranges[i].start = sys_region->start; + ranges[i].end = sys_region->end; + if (i == 0) + continue; + if (ranges[i - 1].end > ranges[i].start) + goto out; } - 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, _ Patches currently in -mm which might be from sj@xxxxxxxxxx are mm-damon-core-test-add-a-kunit-test-case-for-ops-registration.patch mm-damon-core-add-a-function-for-damon_operations-registration-checks.patch mm-damon-sysfs-add-a-file-for-listing-available-monitoring-ops.patch selftets-damon-sysfs-test-existence-and-permission-of-avail_operations.patch docs-abiadmin-guide-damon-document-avail_operations-sysfs-file.patch mm-damon-vaddr-register-a-damon_operations-for-fixed-virtual-address-ranges-monitoring.patch mm-damon-sysfs-support-fixed-virtual-address-ranges-monitoring.patch docs-abiadmin-guide-damon-update-for-fixed-virtual-address-ranges-monitoring.patch mm-damon-core-add-a-new-callback-for-watermarks-checks.patch mm-damon-core-finish-kdamond-as-soon-as-any-callback-returns-an-error.patch mm-damon-vaddr-generalize-damon_va_apply_three_regions.patch mm-damon-vaddr-move-damon_set_regions-to-core.patch mm-damon-vaddr-remove-damon_va_apply_three_regions.patch mm-damon-sysfs-prohibit-multiple-physical-address-space-monitoring-targets.patch mm-damon-sysfs-move-targets-setup-code-to-a-separated-function.patch mm-damon-sysfs-reuse-damon_set_regions-for-regions-setting.patch mm-damon-sysfs-use-enum-for-state-input-handling.patch mm-damon-sysfs-update-schemes-stat-in-the-kdamond-context.patch mm-damon-sysfs-support-online-inputs-update.patch docs-abiadmin-guide-damon-update-for-state-sysfs-file-input-keyword-commit.patch mm-damon-reclaim-support-online-inputs-update.patch docs-admin-guide-mm-damon-reclaim-document-commit_inputs-parameter.patch