UPSTREAM: mm/damon: modify damon_rand() macro to static inline function

damon_rand() cannot be implemented as a macro.

Example:
	damon_rand(a++, b);

The value of 'a' will be incremented twice, This is obviously
unreasonable, So there fix it.

Link: https://lkml.kernel.org/r/110ffcd4e420c86c42b41ce2bc9f0fe6a4f32cd3.1638795127.git.xhao@linux.alibaba.com
Fixes: b9a6ac4e4ede ("mm/damon: adaptively adjust regions")
Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 234d68732b6c135087bdebfa0630a43ae8c27758)

Bug: 228223814
Signed-off-by: Hailong Tu <tuhailong@oppo.com>
Change-Id: Idcc316e6f582959254111fb160d04875d235c306
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
Xin Hao 2022-01-14 14:09:56 -08:00 committed by spakkkk
parent 9c59e5669a
commit 8f945e3945

View File

@ -19,7 +19,10 @@
#define DAMOS_MAX_SCORE (99) #define DAMOS_MAX_SCORE (99)
/* Get a random number in [l, r) */ /* Get a random number in [l, r) */
#define damon_rand(l, r) (l + prandom_u32_max(r - l)) static inline unsigned long damon_rand(unsigned long l, unsigned long r)
{
return l + prandom_u32_max(r - l);
}
/** /**
* struct damon_addr_range - Represents an address region of [@start, @end). * struct damon_addr_range - Represents an address region of [@start, @end).