xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: mm/damon/core: fix fake load reports due to uninterruptible sleeps

Browse Source 
Because DAMON sleeps in uninterruptible mode, /proc/loadavg reports fake
load while DAMON is turned on, though it is doing nothing.  This can
confuse users[1].  To avoid the case, this commit makes DAMON sleeps in
idle mode.

[1] https://lore.kernel.org/all/11868371.O9o76ZdvQC@natalenko.name/

Link: https://lkml.kernel.org/r/20211126145015.15862-3-sj@kernel.org
Fixes: 2224d8485492 ("mm: introduce Data Access MONitor (DAMON)")
Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: SeongJae Park <sj@kernel.org>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 70e9274805fccfd175d0431a947bfd11ee7df40e)

Bug: 228223814
Signed-off-by: Hailong Tu <tuhailong@oppo.com>
Change-Id: Id3518e85d9b1db9f71b62932418993b4b9666326
This commit is contained in:
SeongJae Park
2021-12-10 14:46:25 -08:00
committed by Hailong Tu
parent a9ec7ed936
commit 63e8bc85e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mm/damon/core.c
View File

@@ -981,9 +981,9 @@ static unsigned long damos_wmark_wait_us(struct damos *scheme)
static void kdamond_usleep(unsigned long usecs) static void kdamond_usleep(unsigned long usecs)
{ {
if (usecs > 100 * 1000) if (usecs > 100 * 1000)
schedule_timeout_interruptible(usecs_to_jiffies(usecs)); schedule_timeout_idle(usecs_to_jiffies(usecs));
else else
usleep_range(usecs, usecs + 1); usleep_idle_range(usecs, usecs + 1);
} }
/* Returns negative error code if it's not activated but should return */ /* Returns negative error code if it's not activated but should return */
@@ -1038,7 +1038,7 @@ static int kdamond_fn(void *data)
ctx->callback.after_sampling(ctx)) ctx->callback.after_sampling(ctx))
done = true; done = true;
usleep_range(ctx->sample_interval, ctx->sample_interval + 1); kdamond_usleep(ctx->sample_interval);
if (ctx->primitive.check_accesses) if (ctx->primitive.check_accesses)
max_nr_accesses = ctx->primitive.check_accesses(ctx); max_nr_accesses = ctx->primitive.check_accesses(ctx);