Skip to content

Commit b5ca3e8

Browse files
Xin Haotorvalds
authored andcommitted
mm/damon/dbgfs: add adaptive_targets list check before enable monitor_on
When the ctx->adaptive_targets list is empty, I did some test on monitor_on interface like this. # cat /sys/kernel/debug/damon/target_ids # # echo on > /sys/kernel/debug/damon/monitor_on # damon: kdamond (5390) starts Though the ctx->adaptive_targets list is empty, but the kthread_run still be called, and the kdamond.x thread still be created, this is meaningless. So there adds a judgment in 'dbgfs_monitor_on_write', if the ctx->adaptive_targets list is empty, return -EINVAL. Link: https://lkml.kernel.org/r/0a60a6e8ec9d71989e0848a4dc3311996ca3b5d4.1634720326.git.xhao@linux.alibaba.com Signed-off-by: Xin Hao <[email protected]> Reviewed-by: SeongJae Park <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent a460a36 commit b5ca3e8

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

include/linux/damon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ void damon_destroy_scheme(struct damos *s);
440440

441441
struct damon_target *damon_new_target(unsigned long id);
442442
void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);
443+
bool damon_targets_empty(struct damon_ctx *ctx);
443444
void damon_free_target(struct damon_target *t);
444445
void damon_destroy_target(struct damon_target *t);
445446
unsigned int damon_nr_regions(struct damon_target *t);

mm/damon/core.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ void damon_add_target(struct damon_ctx *ctx, struct damon_target *t)
180180
list_add_tail(&t->list, &ctx->adaptive_targets);
181181
}
182182

183+
bool damon_targets_empty(struct damon_ctx *ctx)
184+
{
185+
return list_empty(&ctx->adaptive_targets);
186+
}
187+
183188
static void damon_del_target(struct damon_target *t)
184189
{
185190
list_del(&t->list);

mm/damon/dbgfs.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -878,12 +878,21 @@ static ssize_t dbgfs_monitor_on_write(struct file *file,
878878
return -EINVAL;
879879
}
880880

881-
if (!strncmp(kbuf, "on", count))
881+
if (!strncmp(kbuf, "on", count)) {
882+
int i;
883+
884+
for (i = 0; i < dbgfs_nr_ctxs; i++) {
885+
if (damon_targets_empty(dbgfs_ctxs[i])) {
886+
kfree(kbuf);
887+
return -EINVAL;
888+
}
889+
}
882890
ret = damon_start(dbgfs_ctxs, dbgfs_nr_ctxs);
883-
else if (!strncmp(kbuf, "off", count))
891+
} else if (!strncmp(kbuf, "off", count)) {
884892
ret = damon_stop(dbgfs_ctxs, dbgfs_nr_ctxs);
885-
else
893+
} else {
886894
ret = -EINVAL;
895+
}
887896

888897
if (!ret)
889898
ret = count;

0 commit comments

Comments
 (0)