Skip to contentSkip to conversation

mm/damon: Fix some small bugs

PATCH Superseded Xin Hao 2 participants 7 messages Oct 20, 2021

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Xin Hao

author
#0 lore raw

v3 cover mm/damon: Fix some small bugs

v3 -> V2
-- Fix some formatting issues
-- Modify the return value of 'damon_targets_empty' to bool type

V1 -> V2
-- As SeongJae Park advised, put 'ctx->adaptive_targets check' into 'dbgfs_monitor_on_write()'

Xin Hao (2):
mm/damon: Remove unnecessary variable initialization mm/damon/dbgfs: Add adaptive_targets list check before enable
monitor_on

 include/linux/damon.h |  1 +
 mm/damon/core.c       |  5 +++++
 mm/damon/dbgfs.c      | 13 ++++++++++---
 mm/damon/vaddr.c      |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

--
2.31.0

author
#1 lore raw

PATCH v3 1/2 mm/damon: Remove unnecessary variable initialization

In 'damon_va_apply_three_regions', There is no
need to set variable 'i' as 0

---
 mm/damon/vaddr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/vaddr.c +1 -1
index b8ba44f69db6..90be463efff7 100644
@@ -305,7 +305,7 @@ static void damon_va_apply_three_regions(struct damon_target *t,
 		struct damon_addr_range bregions[3])
 {
 	struct damon_region *r, *next;
-	unsigned int i = 0;
+	unsigned int i;
 
 	/* Remove regions which are not in the three big regions now */
 	damon_for_each_region_safe(r, next, t) {
Signature · 1 line
2.31.0
maintainer Reviewed-by on v3 1/2
#2 lore raw

Re: [PATCH v3 1/2] mm/damon: Remove unnecessary variable initialization

Quoted 4 lines · On Wed, 20 Oct 2021 09:42:32 +0800 Xin Hao <[email protected]> wrote:

In 'damon_va_apply_three_regions', There is no
need to set variable 'i' as 0

I gave you my 'Reviewed-by:' for the last version of this patch, but seems you missed putting it here. So, I'm giving it here again ;)

Thanks,
SJ

Quoted 19 lines
---
 mm/damon/vaddr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/vaddr.c +1 -1
index b8ba44f69db6..90be463efff7 100644
@@ -305,7 +305,7 @@ static void damon_va_apply_three_regions(struct damon_target *t,
 		struct damon_addr_range bregions[3])
 {
 	struct damon_region *r, *next;
-	unsigned int i = 0;
+	unsigned int i;
 
 	/* Remove regions which are not in the three big regions now */
 	damon_for_each_region_safe(r, next, t) {
Signature · 1 line
2.31.0
author
#3 lore raw

PATCH v3 2/2 mm/damon/dbgfs: Add adaptive_targets list check before enable monitor_on

In reply to Xin Hao

When the ctx->adaptive_targets list is empty, I did some test on monitor_on interface like this.

    # echo > /sys/kernel/debug/damon/target_ids

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.

---
 include/linux/damon.h |  1 +
 mm/damon/core.c       |  5 +++++
 mm/damon/dbgfs.c      | 13 ++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
include/linux/damon.h +1 -0
index 715dadd21f7c..4fce5f1f6dad 100644
@@ -316,6 +316,7 @@ void damon_destroy_scheme(struct damos *s);
 
 struct damon_target *damon_new_target(unsigned long id);
 void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);
+bool damon_targets_empty(struct damon_ctx *ctx);
 void damon_free_target(struct damon_target *t);
 void damon_destroy_target(struct damon_target *t);
 unsigned int damon_nr_regions(struct damon_target *t);
mm/damon/core.c +5 -0
index 2f6785737902..c3a1374dbe0b 100644
@@ -156,6 +156,11 @@ void damon_add_target(struct damon_ctx *ctx, struct damon_target *t)
 	list_add_tail(&t->list, &ctx->adaptive_targets);
 }
 
+bool damon_targets_empty(struct damon_ctx *ctx)
+{
+	return list_empty(&ctx->adaptive_targets);
+}
+
 static void damon_del_target(struct damon_target *t)
 {
 	list_del(&t->list);
mm/damon/dbgfs.c +10 -3
index 38188347d8ab..9dee29f7d103 100644
@@ -865,12 +865,19 @@ static ssize_t dbgfs_monitor_on_write(struct file *file,
 		return -EINVAL;
 	}
 
-	if (!strncmp(kbuf, "on", count))
+	if (!strncmp(kbuf, "on", count)) {
+		int i;
+
+		for (i = 0; i < dbgfs_nr_ctxs; i++) {
+			if (damon_targets_empty(dbgfs_ctxs[i]))
+				return -EINVAL;
+		}
 		err = damon_start(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else if (!strncmp(kbuf, "off", count))
+	} else if (!strncmp(kbuf, "off", count)) {
 		err = damon_stop(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else
+	} else {
 		err = -EINVAL;
+	}
 
 	if (err)
 		ret = err;

--
2.31.0

maintainer
#4 lore raw

Re: [PATCH v3 2/2] mm/damon/dbgfs: Add adaptive_targets list check before enable monitor_on

Quoted 4 lines · On Wed, 20 Oct 2021 09:42:33 +0800 Xin Hao <[email protected]> wrote:

When the ctx->adaptive_targets list is empty, I did some test on monitor_on interface like this.

    # echo > /sys/kernel/debug/damon/target_ids

Thanks for the change, but you missed writing 'on' to 'monitor_on' in the above example.

Quoted 9 lines

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.

Other parts looks good to me. However, seems this commit conflicts with a patch[1] which already merged in -mm tree. Could you please rebase this on it? FYI, all DAMON patches that merged in -mm tree are also applied on DAMON development tree. So, you could get the patch applied tree by:

    $ git remote add sj git://git.kernel.org/pub/scm/linux/kernel/git/sj/linux.git
    $ git fetch sj
    $ git checkout 0fa378d04b12

[1] https://lore.kernel.org/linux-mm/[email protected]/

Thanks,
SJ

Quoted 63 lines
---
 include/linux/damon.h |  1 +
 mm/damon/core.c       |  5 +++++
 mm/damon/dbgfs.c      | 13 ++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
include/linux/damon.h +1 -0
index 715dadd21f7c..4fce5f1f6dad 100644
@@ -316,6 +316,7 @@ void damon_destroy_scheme(struct damos *s);
 
 struct damon_target *damon_new_target(unsigned long id);
 void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);
+bool damon_targets_empty(struct damon_ctx *ctx);
 void damon_free_target(struct damon_target *t);
 void damon_destroy_target(struct damon_target *t);
 unsigned int damon_nr_regions(struct damon_target *t);
mm/damon/core.c +5 -0
index 2f6785737902..c3a1374dbe0b 100644
@@ -156,6 +156,11 @@ void damon_add_target(struct damon_ctx *ctx, struct damon_target *t)
 	list_add_tail(&t->list, &ctx->adaptive_targets);
 }
 
+bool damon_targets_empty(struct damon_ctx *ctx)
+{
+	return list_empty(&ctx->adaptive_targets);
+}
+
 static void damon_del_target(struct damon_target *t)
 {
 	list_del(&t->list);
mm/damon/dbgfs.c +10 -4
index 38188347d8ab..9dee29f7d103 100644
@@ -865,12 +865,19 @@ static ssize_t dbgfs_monitor_on_write(struct file *file,
 		return -EINVAL;
 	}
 
-	if (!strncmp(kbuf, "on", count))
+	if (!strncmp(kbuf, "on", count)) {
+		int i;
+
+		for (i = 0; i < dbgfs_nr_ctxs; i++) {
+			if (damon_targets_empty(dbgfs_ctxs[i]))
+				return -EINVAL;
+		}
 		err = damon_start(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else if (!strncmp(kbuf, "off", count))
+	} else if (!strncmp(kbuf, "off", count)) {
 		err = damon_stop(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else
+	} else {
 		err = -EINVAL;
+	}
 
 	if (err)
 		ret = err;
--

2.31.0

maintainer
#5 lore raw

Re: [PATCH v3 2/2] mm/damon/dbgfs: Add adaptive_targets list check before enable monitor_on

Quoted 77 lines · On Wed, 20 Oct 2021 07:21:21 +0000 SeongJae Park <[email protected]> wrote:
Quoted 4 lines · On Wed, 20 Oct 2021 09:42:33 +0800 Xin Hao <[email protected]> wrote:

When the ctx->adaptive_targets list is empty, I did some test on monitor_on interface like this.

    # echo > /sys/kernel/debug/damon/target_ids

Thanks for the change, but you missed writing 'on' to 'monitor_on' in the above example.

Quoted 9 lines

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.

Other parts looks good to me. However, seems this commit conflicts with a patch[1] which already merged in -mm tree. Could you please rebase this on it? FYI, all DAMON patches that merged in -mm tree are also applied on DAMON development tree. So, you could get the patch applied tree by:

    $ git remote add sj git://git.kernel.org/pub/scm/linux/kernel/git/sj/linux.git
    $ git fetch sj
    $ git checkout 0fa378d04b12

[1] https://lore.kernel.org/linux-mm/[email protected]/

Thanks,
SJ

Quoted 42 lines
---
 include/linux/damon.h |  1 +
 mm/damon/core.c       |  5 +++++
 mm/damon/dbgfs.c      | 13 ++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
include/linux/damon.h +1 -0
index 715dadd21f7c..4fce5f1f6dad 100644
@@ -316,6 +316,7 @@ void damon_destroy_scheme(struct damos *s);
 
 struct damon_target *damon_new_target(unsigned long id);
 void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);
+bool damon_targets_empty(struct damon_ctx *ctx);
 void damon_free_target(struct damon_target *t);
 void damon_destroy_target(struct damon_target *t);
 unsigned int damon_nr_regions(struct damon_target *t);
mm/damon/core.c +5 -0
index 2f6785737902..c3a1374dbe0b 100644
@@ -156,6 +156,11 @@ void damon_add_target(struct damon_ctx *ctx, struct damon_target *t)
 	list_add_tail(&t->list, &ctx->adaptive_targets);
 }
 
+bool damon_targets_empty(struct damon_ctx *ctx)
+{
+	return list_empty(&ctx->adaptive_targets);
+}
+
 static void damon_del_target(struct damon_target *t)
 {
 	list_del(&t->list);
mm/damon/dbgfs.c +0 -0
index 38188347d8ab..9dee29f7d103 100644
@@ -865,12 +865,19 @@ static ssize_t dbgfs_monitor_on_write(struct file *file,
 		return -EINVAL;
 	}
 
Quoted 7 lines

mm/damon/dbgfs.c static ssize_t dbgfs_monitor_on_write(struct file *file, · line 873

Quoted 7 lines
mm/damon/dbgfs.c +6 -1
-	if (!strncmp(kbuf, "on", count))
+	if (!strncmp(kbuf, "on", count)) {
+		int i;
+
+		for (i = 0; i < dbgfs_nr_ctxs; i++) {
+			if (damon_targets_empty(dbgfs_ctxs[i]))
+				return -EINVAL;

Oops, I forgot that you should 'kfree(kbuf)' before returning here. Please do that.

Thanks,
SJ

Quoted 16 lines
Quoted 14 lines
mm/damon/dbgfs.c +4 -3
+		}
 		err = damon_start(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else if (!strncmp(kbuf, "off", count))
+	} else if (!strncmp(kbuf, "off", count)) {
 		err = damon_stop(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else
+	} else {
 		err = -EINVAL;
+	}
 
 	if (err)
 		ret = err;
--

2.31.0

author
#6 lore raw

Re: [PATCH v3 2/2] mm/damon/dbgfs: Add adaptive_targets list check before enable monitor_on

Quoted 10 lines · SeongJae Park
Quoted 8 lines · On Wed, 20 Oct 2021 07:21:21 +0000 SeongJae Park <[email protected]> wrote:
Quoted 4 lines · On Wed, 20 Oct 2021 09:42:33 +0800 Xin Hao <[email protected]> wrote:

When the ctx->adaptive_targets list is empty, I did some test on monitor_on interface like this.

     # echo > /sys/kernel/debug/damon/target_ids

Thanks for the change, but you missed writing 'on' to 'monitor_on' in the above example.

Sorry.

Quoted 14 lines
Quoted 14 lines
Quoted 9 lines

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.

Other parts looks good to me. However, seems this commit conflicts with a patch[1] which already merged in -mm tree. Could you please rebase this on it? FYI, all DAMON patches that merged in -mm tree are also applied on DAMON development tree. So, you could get the patch applied tree by:

Quoted 5 lines
Quoted 5 lines
     $ git remote add sj git://git.kernel.org/pub/scm/linux/kernel/git/sj/linux.git
     $ git fetch sj
     $ git checkout 0fa378d04b12

[1] https://lore.kernel.org/linux-mm/[email protected]/

Ok, i will correct it.

Quoted 47 lines
Quoted 47 lines

Thanks,
SJ

Quoted 42 lines
---
  include/linux/damon.h |  1 +
  mm/damon/core.c       |  5 +++++
  mm/damon/dbgfs.c      | 13 ++++++++++---
  3 files changed, 16 insertions(+), 3 deletions(-)
include/linux/damon.h +1 -0
index 715dadd21f7c..4fce5f1f6dad 100644
@@ -316,6 +316,7 @@ void damon_destroy_scheme(struct damos *s);
 
  struct damon_target *damon_new_target(unsigned long id);
  void damon_add_target(struct damon_ctx *ctx, struct damon_target *t);
+bool damon_targets_empty(struct damon_ctx *ctx);
  void damon_free_target(struct damon_target *t);
  void damon_destroy_target(struct damon_target *t);
  unsigned int damon_nr_regions(struct damon_target *t);
mm/damon/core.c +5 -0
index 2f6785737902..c3a1374dbe0b 100644
@@ -156,6 +156,11 @@ void damon_add_target(struct damon_ctx *ctx, struct damon_target *t)
  	list_add_tail(&t->list, &ctx->adaptive_targets);
  }
 
+bool damon_targets_empty(struct damon_ctx *ctx)
+{
+	return list_empty(&ctx->adaptive_targets);
+}
+
  static void damon_del_target(struct damon_target *t)
  {
  	list_del(&t->list);
mm/damon/dbgfs.c +0 -0
index 38188347d8ab..9dee29f7d103 100644
@@ -865,12 +865,19 @@ static ssize_t dbgfs_monitor_on_write(struct file *file,
  		return -EINVAL;
  	}
 
Quoted 9 lines
Quoted 7 lines

mm/damon/dbgfs.c static ssize_t dbgfs_monitor_on_write(struct file *file, · line 873

Quoted 7 lines
mm/damon/dbgfs.c +6 -1
-	if (!strncmp(kbuf, "on", count))
+	if (!strncmp(kbuf, "on", count)) {
+		int i;
+
+		for (i = 0; i < dbgfs_nr_ctxs; i++) {
+			if (damon_targets_empty(dbgfs_ctxs[i]))
+				return -EINVAL;

Oops, I forgot that you should 'kfree(kbuf)' before returning here. Please do that.

Okay,  i will correct it, thank you.

Quoted 19 lines

Thanks,
SJ

Quoted 15 lines
Quoted 14 lines
mm/damon/dbgfs.c +4 -3
+		}
  		err = damon_start(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else if (!strncmp(kbuf, "off", count))
+	} else if (!strncmp(kbuf, "off", count)) {
  		err = damon_stop(dbgfs_ctxs, dbgfs_nr_ctxs);
-	else
+	} else {
  		err = -EINVAL;
+	}
 
  	if (err)
  		ret = err;
--

2.31.0

Signature · 2 lines
Best Regards!
Xin Hao