Skip to contentSkip to conversation

mm/damon: rename sz_damon_region to damon_region_size

PATCH In review Xin Hao 2 participants 4 messages Sep 26, 2022 – Sep 27, 2022

Subsystems (2)
lore
Share & tools
lore

Xin Hao

author
#0 lore raw

PATCH 1/2 mm/damon: rename sz_damon_region to damon_region_size

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

---
 include/linux/damon.h | 1 +
 mm/damon/core.c       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
include/linux/damon.h +1 -0
index ed5470f50bab..21f4bfd0f41f 100644
@@ -524,6 +524,7 @@ void damon_add_region(struct damon_region *r, struct damon_target *t);
 void damon_destroy_region(struct damon_region *r, struct damon_target *t);
 int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
 		unsigned int nr_ranges);
+unsigned long damon_region_size(struct damon_region *r);
 
 struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
 			enum damos_action action, struct damos_quota *quota,
mm/damon/core.c +3 -3
index 4de8c7c52979..74ab45b2c2f1 100644
@@ -864,7 +864,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
 	}
 }
 
-static inline unsigned long sz_damon_region(struct damon_region *r)
+unsigned long damon_region_size(struct damon_region *r)
 {
 	return r->ar.end - r->ar.start;
 }
@@ -875,7 +875,7 @@ static inline unsigned long sz_damon_region(struct damon_region *r)
 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_region_size(l), sz_r = damon_region_size(r);
 
 	l->nr_accesses = (l->nr_accesses * sz_l + r->nr_accesses * sz_r) /
 			(sz_l + sz_r);
@@ -904,7 +904,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_region_size(prev) + damon_region_size(r) <= sz_limit)
 			damon_merge_two_regions(t, prev, r);
 		else
 			prev = r;

--
2.31.0

author
#1 lore raw

PATCH 2/2 mm/damon: use damon_region_size() in appropriate place

In many place, we can use damon_region_size() to instead of "r->ar.end - r->ar.start".

---
 mm/damon/core.c  | 17 ++++++++---------
 mm/damon/vaddr.c |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)
mm/damon/core.c +8 -9
index 74ab45b2c2f1..0368551c5a8b 100644
@@ -490,7 +490,7 @@ static unsigned long damon_region_sz_limit(struct damon_ctx *ctx)
 
 	damon_for_each_target(t, ctx) {
 		damon_for_each_region(r, t)
-			sz += r->ar.end - r->ar.start;
+			sz += damon_region_size(r);
 	}
 
 	if (ctx->attrs.min_nr_regions)
@@ -673,7 +673,7 @@ static bool __damos_valid_target(struct damon_region *r, struct damos *s)
 {
 	unsigned long sz;
 
-	sz = r->ar.end - r->ar.start;
+	sz = damon_region_size(r);
 	return s->pattern.min_sz_region <= sz &&
 		sz <= s->pattern.max_sz_region &&
 		s->pattern.min_nr_accesses <= r->nr_accesses &&
@@ -701,7 +701,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c,
 
 	damon_for_each_scheme(s, c) {
 		struct damos_quota *quota = &s->quota;
-		unsigned long sz = r->ar.end - r->ar.start;
+		unsigned long sz = damon_region_size(r);
 		struct timespec64 begin, end;
 		unsigned long sz_applied = 0;
 
@@ -730,14 +730,14 @@ static void damon_do_apply_schemes(struct damon_ctx *c,
 				sz = ALIGN_DOWN(quota->charge_addr_from -
 						r->ar.start, DAMON_MIN_REGION);
 				if (!sz) {
-					if (r->ar.end - r->ar.start <=
-							DAMON_MIN_REGION)
+					if (damon_region_size(r) <=
+					    DAMON_MIN_REGION)
 						continue;
 					sz = DAMON_MIN_REGION;
 				}
 				damon_split_region_at(t, r, sz);
 				r = damon_next_region(r);
-				sz = r->ar.end - r->ar.start;
+				sz = damon_region_size(r);
 			}
 			quota->charge_target_from = NULL;
 			quota->charge_addr_from = 0;
@@ -842,8 +842,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
 					continue;
 				score = c->ops.get_scheme_score(
 						c, t, r, s);
-				quota->histogram[score] +=
-					r->ar.end - r->ar.start;
+				quota->histogram[score] += damon_region_size(r);
 				if (score > max_score)
 					max_score = score;
 			}
@@ -962,7 +961,7 @@ static void damon_split_regions_of(struct damon_target *t, int nr_subs)
 	int i;
 
 	damon_for_each_region_safe(r, next, t) {
-		sz_region = r->ar.end - r->ar.start;
+		sz_region = damon_region_size(r);
 
 		for (i = 0; i < nr_subs - 1 &&
 				sz_region > 2 * DAMON_MIN_REGION; i++) {
mm/damon/vaddr.c +2 -2
index ea94e0b2c311..bd1ac9db0f49 100644
@@ -72,7 +72,7 @@ static int damon_va_evenly_split_region(struct damon_target *t,
 		return -EINVAL;
 
 	orig_end = r->ar.end;
-	sz_orig = r->ar.end - r->ar.start;
+	sz_orig = damon_region_size(r);
 	sz_piece = ALIGN_DOWN(sz_orig / nr_pieces, DAMON_MIN_REGION);
 
 	if (!sz_piece)
@@ -618,7 +618,7 @@ static unsigned long damos_madvise(struct damon_target *target,
 {
 	struct mm_struct *mm;
 	unsigned long start = PAGE_ALIGN(r->ar.start);
-	unsigned long len = PAGE_ALIGN(r->ar.end - r->ar.start);
+	unsigned long len = PAGE_ALIGN(damon_region_size(r));
 	unsigned long applied;
 
 	mm = damon_get_mm(target);

--
2.31.0

maintainer
#2 lore raw
In reply to Xin Hao
Quoted 2 lines · On Mon, 26 Sep 2022 15:10:59 +0800 Xin Hao <[email protected]> wrote:

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

Good idea.

Quoted 12 lines
---
 include/linux/damon.h | 1 +
 mm/damon/core.c       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
include/linux/damon.h +0 -0
index ed5470f50bab..21f4bfd0f41f 100644

include/linux/damon.h void damon_add_region(struct damon_region *r, struct damon_target *t); · line 527

Quoted 4 lines
include/linux/damon.h +1 -0
@@ -524,6 +524,7 @@ void damon_add_region(struct damon_region *r, struct damon_target *t);
 void damon_destroy_region(struct damon_region *r, struct damon_target *t);
 int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
 		unsigned int nr_ranges);
+unsigned long damon_region_size(struct damon_region *r);

This name looks good enough, but I'd like to suggest damon_sz_region(). What do you think?

Also, I'd like to keep this function 'static inline' and put the definition just after that of 'damon_first_region()'.

Thanks,
SJ

Quoted 37 lines
include/linux/damon.h +0 -0
 struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
 			enum damos_action action, struct damos_quota *quota,
mm/damon/core.c +3 -4
index 4de8c7c52979..74ab45b2c2f1 100644
@@ -864,7 +864,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
 	}
 }
 
-static inline unsigned long sz_damon_region(struct damon_region *r)
+unsigned long damon_region_size(struct damon_region *r)
 {
 	return r->ar.end - r->ar.start;
 }
@@ -875,7 +875,7 @@ static inline unsigned long sz_damon_region(struct damon_region *r)
 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_region_size(l), sz_r = damon_region_size(r);
 
 	l->nr_accesses = (l->nr_accesses * sz_l + r->nr_accesses * sz_r) /
 			(sz_l + sz_r);
@@ -904,7 +904,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_region_size(prev) + damon_region_size(r) <= sz_limit)
 			damon_merge_two_regions(t, prev, r);
 		else
 			prev = r;
--

2.31.0

author
#3 lore raw
Quoted 12 lines · SeongJae Park
Quoted 2 lines · On Mon, 26 Sep 2022 15:10:59 +0800 Xin Hao <[email protected]> wrote:

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

Good idea.

Quoted 6 lines
---
  include/linux/damon.h | 1 +
  mm/damon/core.c       | 6 +++---
  2 files changed, 4 insertions(+), 3 deletions(-)
Quoted 11 lines

include/linux/damon.h void damon_add_region(struct damon_region *r, struct damon_target *t); · line 527

Quoted 9 lines
include/linux/damon.h +1 -0
index ed5470f50bab..21f4bfd0f41f 100644
@@ -524,6 +524,7 @@ void damon_add_region(struct damon_region *r, struct damon_target *t);
  void damon_destroy_region(struct damon_region *r, struct damon_target *t);
  int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
  		unsigned int nr_ranges);
+unsigned long damon_region_size(struct damon_region *r);

This name looks good enough, but I'd like to suggest damon_sz_region(). What do you think?

Yes,  the fisrt  i named damon_sz_region, but later i changed it to damon_region_size, so i will change it back.

Quoted 3 lines

Also, I'd like to keep this function 'static inline' and put the definition just after that of 'damon_first_region()'.

Ok, thanks

Quoted 41 lines

Thanks,
SJ

Quoted 36 lines
include/linux/damon.h +0 -0
  struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
  			enum damos_action action, struct damos_quota *quota,
mm/damon/core.c +3 -4
index 4de8c7c52979..74ab45b2c2f1 100644
@@ -864,7 +864,7 @@ static void kdamond_apply_schemes(struct damon_ctx *c)
  	}
  }
 
-static inline unsigned long sz_damon_region(struct damon_region *r)
+unsigned long damon_region_size(struct damon_region *r)
  {
  	return r->ar.end - r->ar.start;
  }
@@ -875,7 +875,7 @@ static inline unsigned long sz_damon_region(struct damon_region *r)
  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_region_size(l), sz_r = damon_region_size(r);
 
  	l->nr_accesses = (l->nr_accesses * sz_l + r->nr_accesses * sz_r) /
  			(sz_l + sz_r);
@@ -904,7 +904,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_region_size(prev) + damon_region_size(r) <= sz_limit)
  			damon_merge_two_regions(t, prev, r);
  		else
  			prev = r;
--

2.31.0