diff mbox series

[v1,1/2] mm/damon: rename sz_damon_region to damon_region_size

Message ID 20220926071100.76379-1-xhao@linux.alibaba.com (mailing list archive)
State New
Headers show
Series [v1,1/2] mm/damon: rename sz_damon_region to damon_region_size | expand

Commit Message

haoxin Sept. 26, 2022, 7:10 a.m. UTC 
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.

Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
---
 include/linux/damon.h | 1 +
 mm/damon/core.c       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

--
2.31.0

Comments

SeongJae Park Sept. 26, 2022, 4:16 p.m. UTC | #1 
On Mon, 26 Sep 2022 15:10:59 +0800 Xin Hao <xhao@linux.alibaba.com> 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.

> 
> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
> ---
>  include/linux/damon.h | 1 +
>  mm/damon/core.c       | 6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/damon.h b/include/linux/damon.h
> index ed5470f50bab..21f4bfd0f41f 100644
> --- a/include/linux/damon.h
> +++ b/include/linux/damon.h
> @@ -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

> 
>  struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
>  			enum damos_action action, struct damos_quota *quota,
> diff --git a/mm/damon/core.c b/mm/damon/core.c
> index 4de8c7c52979..74ab45b2c2f1 100644
> --- a/mm/damon/core.c
> +++ b/mm/damon/core.c
> @@ -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
>
haoxin Sept. 27, 2022, 12:04 a.m. UTC | #2 
在 2022/9/27 上午12:16, SeongJae Park 写道:
> On Mon, 26 Sep 2022 15:10:59 +0800 Xin Hao <xhao@linux.alibaba.com> 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.
>
>> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
>> ---
>>   include/linux/damon.h | 1 +
>>   mm/damon/core.c       | 6 +++---
>>   2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/linux/damon.h b/include/linux/damon.h
>> index ed5470f50bab..21f4bfd0f41f 100644
>> --- a/include/linux/damon.h
>> +++ b/include/linux/damon.h
>> @@ -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.
>
> Also, I'd like to keep this function 'static inline' and put the definition
> just after that of 'damon_first_region()'.
Ok, thanks
>
>
> Thanks,
> SJ
>
>>   struct damos *damon_new_scheme(struct damos_access_pattern *pattern,
>>   			enum damos_action action, struct damos_quota *quota,
>> diff --git a/mm/damon/core.c b/mm/damon/core.c
>> index 4de8c7c52979..74ab45b2c2f1 100644
>> --- a/mm/damon/core.c
>> +++ b/mm/damon/core.c
>> @@ -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
>>
diff mbox series

Patch

diff --git a/include/linux/damon.h b/include/linux/damon.h
index ed5470f50bab..21f4bfd0f41f 100644
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -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,
diff --git a/mm/damon/core.c b/mm/damon/core.c
index 4de8c7c52979..74ab45b2c2f1 100644
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -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;