You need to sign in or sign up before continuing.
提交 80701b79 编写于 作者: S SeongJae Park 提交者: Zheng Zengkai

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

mainline inclusion
from mainline-v5.16-rc5
commit 70e92748
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4RTX9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=70e9274805fccfd175d0431a947bfd11ee7df40e

--------------------------------

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: 2224d848 ("mm: introduce Data Access MONitor (DAMON)")
Reported-by: NOleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: NSeongJae Park <sj@kernel.org>
Tested-by: NOleksandr 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 70e92748)
Signed-off-by: NYue Zou <zouyue3@huawei.com>
Reviewed-by: Kefeng Wang<wangkefeng.wang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 9a0963c6
...@@ -981,9 +981,9 @@ static unsigned long damos_wmark_wait_us(struct damos *scheme) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册