Skip to content

Commit

Permalink
mm/damon/dbgfs: use damon_select_ops() instead of damon_{v,p}a_set_op…
Browse files Browse the repository at this point in the history
…erations()

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/[email protected]
Signed-off-by: SeongJae Park <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Xin Hao <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
sjp38 authored and torvalds committed Mar 22, 2022
1 parent 4d69c34 commit da7aaca
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions mm/damon/dbgfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -474,12 +474,18 @@ static ssize_t dbgfs_target_ids_write(struct file *file,

/* 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)
Expand Down Expand Up @@ -735,7 +741,11 @@ static struct damon_ctx *dbgfs_new_ctx(void)
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;
}
Expand Down

0 comments on commit da7aaca

Please sign in to comment.