[v2,1/2] mm/damon: move sz_damon_region to damon_sz_region

Commit Message

haoxin Sept. 27, 2022, 12:19 a.m. UTC

Here, i rename sz_damon_region() to damon_sz_region(), and move it to
"include/linux/damon.h", because in many places, we can to use this func.

Suggested-by: SeongJae Park <[e-mail]>
Signed-off-by: Xin Hao <[e-mail]>
---

Changes from v1
( https://lore.kernel.org/linux-mm/[e-mail]/)
- Move sz_damon_region() to static inline in include/linux/damon.h
- Rename sz_damon_region() to damon_sz_region()

 include/linux/damon.h | 6 ++++++
 mm/damon/core.c       | 9 ++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

--
2.31.0

Comments

SeongJae Park Sept. 27, 2022, 4:46 p.m. UTC | #1

On Tue, 27 Sep 2022 08:19:45 +0800 Xin Hao <[e-mail]> wrote:

> Here, i rename sz_damon_region() to damon_sz_region(), and move it to
> "include/linux/damon.h", because in many places, we can to use this func.

Thank you for your works, Xin!

> 
> Suggested-by: SeongJae Park <[e-mail]>
> Signed-off-by: Xin Hao <[e-mail]>

For the series,

Reviewed-by: SeongJae Park <[e-mail]>


Thanks,
SJ

[...]

Patch

diff --git a/include/linux/damon.h b/include/linux/damon.h
index ed5470f50bab..620ada094c3b 100644
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -484,6 +484,12 @@  static inline struct damon_region *damon_first_region(struct damon_target *t)
 	return list_first_entry(&t->regions_list, struct damon_region, list);
 }

+static inline unsigned long damon_sz_region(struct damon_region *r)
+{
+	return r->ar.end - r->ar.start;
+}
+
+
 #define damon_for_each_region(r, t) \
 	list_for_each_entry(r, &t->regions_list, list)

diff --git a/mm/damon/core.c b/mm/damon/core.c
index 4de8c7c52979..5b9e0d585aef 100644
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -864,18 +864,13 @@  static void kdamond_apply_schemes(struct damon_ctx *c)
 	}
 }

-static inline unsigned long sz_damon_region(struct damon_region *r)
-{
-	return r->ar.end - r->ar.start;
-}
-
 /*
  * Merge two adjacent regions into one region
  */
 static void damon_merge_two_regions(struct damon_target *t,
 		struct damon_region *l, struct damon_region *r)
 {
-	unsigned long sz_l = sz_damon_region(l), sz_r = sz_damon_region(r);
+	unsigned long sz_l = damon_sz_region(l), sz_r = damon_sz_region(r);

 	l->nr_accesses = (l->nr_accesses * sz_l + r->nr_accesses * sz_r) /
 			(sz_l + sz_r);
@@ -904,7 +899,7 @@  static void damon_merge_regions_of(struct damon_target *t, unsigned int thres,

 		if (prev && prev->ar.end == r->ar.start &&
 		    abs(prev->nr_accesses - r->nr_accesses) <= thres &&
-		    sz_damon_region(prev) + sz_damon_region(r) <= sz_limit)
+		    damon_sz_region(prev) + damon_sz_region(r) <= sz_limit)
 			damon_merge_two_regions(t, prev, r);
 		else
 			prev = r;