diff mbox series

[V1,2/2] mm/damon: move damon_rand definition into damon.h

Message ID 6a4a7e53c2ab99028d431e7dc5e3d7635adb8522.1637429074.git.xhao@linux.alibaba.com (mailing list archive)
State New
Headers show
Series [V1,1/2] mm/damon/dbgfs: Modify Damon dbfs interface dependency in Kconfig | expand

Commit Message

haoxin Nov. 20, 2021, 5:27 p.m. UTC 
damon_rand() is called in three files:damon/core.c, damon/
paddr.c, damon/vaddr.c, i think there is no need to redefine
this twice, So move it to damon.h will be a good choice.

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

Comments

SeongJae Park Nov. 21, 2021, 11:33 a.m. UTC | #1 
Hi Xin,


On Sun, 21 Nov 2021 01:27:54 +0800 Xin Hao <xhao@linux.alibaba.com> wrote:

> damon_rand() is called in three files:damon/core.c, damon/
> paddr.c, damon/vaddr.c, i think there is no need to redefine
> this twice, So move it to damon.h will be a good choice.

Good finding.  Could you please append '()' after 'damon_rand' in the title
(s/damon_rand definition/damon_rand() definition)?

> 
> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>

After doing that, you could add

Reviewed-by: SeongJae Park <sj@kernel.org>


Thanks,
SJ

> ---
>  include/linux/damon.h   | 4 ++++
>  mm/damon/core.c         | 4 ----
>  mm/damon/prmtv-common.h | 4 ----
>  3 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/include/linux/damon.h b/include/linux/damon.h
> index 8a73e825e0d5..8706b17a9acf 100644
> --- a/include/linux/damon.h
> +++ b/include/linux/damon.h
> @@ -11,12 +11,16 @@
>  #include <linux/mutex.h>
>  #include <linux/time64.h>
>  #include <linux/types.h>
> +#include <linux/random.h>
>  
>  /* Minimal region size.  Every damon_region is aligned by this. */
>  #define DAMON_MIN_REGION	PAGE_SIZE
>  /* Max priority score for DAMON-based operation schemes */
>  #define DAMOS_MAX_SCORE		(99)
>  
> +/* Get a random number in [l, r) */
> +#define damon_rand(l, r) (l + prandom_u32_max(r - l))
> +
>  /**
>   * struct damon_addr_range - Represents an address region of [@start, @end).
>   * @start:	Start address of the region (inclusive).
> diff --git a/mm/damon/core.c b/mm/damon/core.c
> index 4d2c3a0c7c8a..bdec32ef78c0 100644
> --- a/mm/damon/core.c
> +++ b/mm/damon/core.c
> @@ -11,7 +11,6 @@
>  #include <linux/delay.h>
>  #include <linux/kthread.h>
>  #include <linux/mm.h>
> -#include <linux/random.h>
>  #include <linux/slab.h>
>  #include <linux/string.h>
>  
> @@ -23,9 +22,6 @@
>  #define DAMON_MIN_REGION 1
>  #endif
>  
> -/* Get a random number in [l, r) */
> -#define damon_rand(l, r) (l + prandom_u32_max(r - l))
> -
>  static DEFINE_MUTEX(damon_lock);
>  static int nr_running_ctxs;
>  
> diff --git a/mm/damon/prmtv-common.h b/mm/damon/prmtv-common.h
> index 61f27037603e..e790cb5f8fe0 100644
> --- a/mm/damon/prmtv-common.h
> +++ b/mm/damon/prmtv-common.h
> @@ -6,10 +6,6 @@
>   */
>  
>  #include <linux/damon.h>
> -#include <linux/random.h>
> -
> -/* Get a random number in [l, r) */
> -#define damon_rand(l, r) (l + prandom_u32_max(r - l))
>  
>  struct page *damon_get_page(unsigned long pfn);
>  
> -- 
> 2.31.0
> 
>
haoxin Nov. 21, 2021, 1:20 p.m. UTC | #2 
Hi Park:

On 11/21/21 7:33 PM, SeongJae Park wrote:
> Hi Xin,
>
>
> On Sun, 21 Nov 2021 01:27:54 +0800 Xin Hao <xhao@linux.alibaba.com> wrote:
>
>> damon_rand() is called in three files:damon/core.c, damon/
>> paddr.c, damon/vaddr.c, i think there is no need to redefine
>> this twice, So move it to damon.h will be a good choice.
> Good finding.  Could you please append '()' after 'damon_rand' in the title
> (s/damon_rand definition/damon_rand() definition)?
Ok i will do;
>
>> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
> After doing that, you could add
>
> Reviewed-by: SeongJae Park <sj@kernel.org>
>
>
> Thanks,
> SJ
>
>> ---
>>   include/linux/damon.h   | 4 ++++
>>   mm/damon/core.c         | 4 ----
>>   mm/damon/prmtv-common.h | 4 ----
>>   3 files changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/include/linux/damon.h b/include/linux/damon.h
>> index 8a73e825e0d5..8706b17a9acf 100644
>> --- a/include/linux/damon.h
>> +++ b/include/linux/damon.h
>> @@ -11,12 +11,16 @@
>>   #include <linux/mutex.h>
>>   #include <linux/time64.h>
>>   #include <linux/types.h>
>> +#include <linux/random.h>
>>   
>>   /* Minimal region size.  Every damon_region is aligned by this. */
>>   #define DAMON_MIN_REGION	PAGE_SIZE
>>   /* Max priority score for DAMON-based operation schemes */
>>   #define DAMOS_MAX_SCORE		(99)
>>   
>> +/* Get a random number in [l, r) */
>> +#define damon_rand(l, r) (l + prandom_u32_max(r - l))
>> +
>>   /**
>>    * struct damon_addr_range - Represents an address region of [@start, @end).
>>    * @start:	Start address of the region (inclusive).
>> diff --git a/mm/damon/core.c b/mm/damon/core.c
>> index 4d2c3a0c7c8a..bdec32ef78c0 100644
>> --- a/mm/damon/core.c
>> +++ b/mm/damon/core.c
>> @@ -11,7 +11,6 @@
>>   #include <linux/delay.h>
>>   #include <linux/kthread.h>
>>   #include <linux/mm.h>
>> -#include <linux/random.h>
>>   #include <linux/slab.h>
>>   #include <linux/string.h>
>>   
>> @@ -23,9 +22,6 @@
>>   #define DAMON_MIN_REGION 1
>>   #endif
>>   
>> -/* Get a random number in [l, r) */
>> -#define damon_rand(l, r) (l + prandom_u32_max(r - l))
>> -
>>   static DEFINE_MUTEX(damon_lock);
>>   static int nr_running_ctxs;
>>   
>> diff --git a/mm/damon/prmtv-common.h b/mm/damon/prmtv-common.h
>> index 61f27037603e..e790cb5f8fe0 100644
>> --- a/mm/damon/prmtv-common.h
>> +++ b/mm/damon/prmtv-common.h
>> @@ -6,10 +6,6 @@
>>    */
>>   
>>   #include <linux/damon.h>
>> -#include <linux/random.h>
>> -
>> -/* Get a random number in [l, r) */
>> -#define damon_rand(l, r) (l + prandom_u32_max(r - l))
>>   
>>   struct page *damon_get_page(unsigned long pfn);
>>   
>> -- 
>> 2.31.0
>>
>>
diff mbox series

Patch

diff --git a/include/linux/damon.h b/include/linux/damon.h
index 8a73e825e0d5..8706b17a9acf 100644
--- a/include/linux/damon.h
+++ b/include/linux/damon.h
@@ -11,12 +11,16 @@ 
 #include <linux/mutex.h>
 #include <linux/time64.h>
 #include <linux/types.h>
+#include <linux/random.h>
 
 /* Minimal region size.  Every damon_region is aligned by this. */
 #define DAMON_MIN_REGION	PAGE_SIZE
 /* Max priority score for DAMON-based operation schemes */
 #define DAMOS_MAX_SCORE		(99)
 
+/* Get a random number in [l, r) */
+#define damon_rand(l, r) (l + prandom_u32_max(r - l))
+
 /**
  * struct damon_addr_range - Represents an address region of [@start, @end).
  * @start:	Start address of the region (inclusive).
diff --git a/mm/damon/core.c b/mm/damon/core.c
index 4d2c3a0c7c8a..bdec32ef78c0 100644
--- a/mm/damon/core.c
+++ b/mm/damon/core.c
@@ -11,7 +11,6 @@ 
 #include <linux/delay.h>
 #include <linux/kthread.h>
 #include <linux/mm.h>
-#include <linux/random.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 
@@ -23,9 +22,6 @@ 
 #define DAMON_MIN_REGION 1
 #endif
 
-/* Get a random number in [l, r) */
-#define damon_rand(l, r) (l + prandom_u32_max(r - l))
-
 static DEFINE_MUTEX(damon_lock);
 static int nr_running_ctxs;
 
diff --git a/mm/damon/prmtv-common.h b/mm/damon/prmtv-common.h
index 61f27037603e..e790cb5f8fe0 100644
--- a/mm/damon/prmtv-common.h
+++ b/mm/damon/prmtv-common.h
@@ -6,10 +6,6 @@ 
  */
 
 #include <linux/damon.h>
-#include <linux/random.h>
-
-/* Get a random number in [l, r) */
-#define damon_rand(l, r) (l + prandom_u32_max(r - l))
 
 struct page *damon_get_page(unsigned long pfn);