The patch titled Subject: mm/damon/dbgfs: use damon_select_ops() instead of damon_{v,p}a_set_operations() has been added to the -mm tree. Its filename is mm-damon-dbgfs-use-damon_select_ops-instead-of-damon_vpa_set_operations.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-damon-dbgfs-use-damon_select_ops-instead-of-damon_vpa_set_operations.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-damon-dbgfs-use-damon_select_ops-instead-of-damon_vpa_set_operations.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: SeongJae Park <sj@xxxxxxxxxx> Subject: mm/damon/dbgfs: use damon_select_ops() instead of damon_{v,p}a_set_operations() This commit makes DAMON debugfs interface to select the registered monitoring operations for the physical address space or virtual address spaces depending on user requests instead of setting it on its own. Note that DAMON debugfs interface is still dependent to DAMON_VADDR with this change, because it is also using its symbol, 'damon_va_target_valid'. Link: https://lkml.kernel.org/r/20220215184603.1479-6-sj@xxxxxxxxxx Signed-off-by: SeongJae Park <sj@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Xin Hao <xhao@xxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/damon/dbgfs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) --- a/mm/damon/dbgfs.c~mm-damon-dbgfs-use-damon_select_ops-instead-of-damon_vpa_set_operations +++ a/mm/damon/dbgfs.c @@ -474,12 +474,18 @@ static ssize_t dbgfs_target_ids_write(st /* remove previously set targets */ dbgfs_set_targets(ctx, 0, NULL); + if (!nr_targets) { + ret = count; + goto unlock_out; + } /* Configure the context for the address space type */ if (id_is_pid) - damon_va_set_operations(ctx); + ret = damon_select_ops(ctx, DAMON_OPS_VADDR); else - damon_pa_set_operations(ctx); + ret = damon_select_ops(ctx, DAMON_OPS_PADDR); + if (ret) + goto unlock_out; ret = dbgfs_set_targets(ctx, nr_targets, target_pids); if (!ret) @@ -735,7 +741,11 @@ static struct damon_ctx *dbgfs_new_ctx(v if (!ctx) return NULL; - damon_va_set_operations(ctx); + if (damon_select_ops(ctx, DAMON_OPS_VADDR) && damon_select_ops(ctx, + DAMON_OPS_PADDR)) { + damon_destroy_ctx(ctx); + return NULL; + } ctx->callback.before_terminate = dbgfs_before_terminate; return ctx; } _ Patches currently in -mm which might be from sj@xxxxxxxxxx are mm-munlock-mlock_page-munlock_page-batch-by-pagevec-fix-2.patch mm-damon-dbgfs-init_regions-use-target-index-instead-of-target-id.patch docs-admin-guide-mm-damon-usage-update-for-changed-initail_regions-file-input.patch mm-damon-core-move-damon_set_targets-into-dbgfs.patch mm-damon-remove-the-target-id-concept.patch mm-damon-rename-damon_primitives-to-damon_operations.patch mm-damon-let-monitoring-operations-can-be-registered-and-selected.patch mm-damon-paddrvaddr-register-themselves-to-damon-in-subsys_initcall.patch mm-damon-reclaim-use-damon_select_ops-instead-of-damon_vpa_set_operations.patch mm-damon-dbgfs-use-damon_select_ops-instead-of-damon_vpa_set_operations.patch mm-damon-dbgfs-use-operations-id-for-knowing-if-the-target-has-pid.patch mm-damon-dbgfs-test-fix-is_target_id-change.patch mm-damon-paddrvaddr-remove-damon_pva_target_validset_operations.patch