Skip to content

Commit 9fd7bb5

Browse files
Quanmin Yanakpm00
authored andcommitted
mm/damon/sysfs: change next_update_jiffies to a global variable
In DAMON's damon_sysfs_repeat_call_fn(), time_before() is used to compare the current jiffies with next_update_jiffies to determine whether to update the sysfs files at this moment. On 32-bit systems, the kernel initializes jiffies to "-5 minutes" to make jiffies wrap bugs appear earlier. However, this causes time_before() in damon_sysfs_repeat_call_fn() to unexpectedly return true during the first 5 minutes after boot on 32-bit systems (see [1] for more explanation, which fixes another jiffies-related issue before). As a result, DAMON does not update sysfs files during that period. There is also an issue unrelated to the system's word size[2]: if the user stops DAMON just after next_update_jiffies is updated and restarts it after 'refresh_ms' or a longer delay, next_update_jiffies will retain an older value, causing time_before() to return false and the update to happen earlier than expected. Fix these issues by making next_update_jiffies a global variable and initializing it each time DAMON is started. Link: https://lkml.kernel.org/r/20251030020746.967174-3-yanquanmin1@huawei.com Link: https://lkml.kernel.org/r/20250822025057.1740854-1-ekffu200098@gmail.com [1] Link: https://lore.kernel.org/all/20251029013038.66625-1-sj@kernel.org/ [2] Fixes: d809a7c ("mm/damon/sysfs: implement refresh_ms file internal work") Suggested-by: SeongJae Park <sj@kernel.org> Reviewed-by: SeongJae Park <sj@kernel.org> Signed-off-by: Quanmin Yan <yanquanmin1@huawei.com> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: ze zuo <zuoze1@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 2f6ce7e commit 9fd7bb5

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

mm/damon/sysfs.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,16 +1552,17 @@ static struct damon_ctx *damon_sysfs_build_ctx(
15521552
return ctx;
15531553
}
15541554

1555+
static unsigned long damon_sysfs_next_update_jiffies;
1556+
15551557
static int damon_sysfs_repeat_call_fn(void *data)
15561558
{
15571559
struct damon_sysfs_kdamond *sysfs_kdamond = data;
1558-
static unsigned long next_update_jiffies;
15591560

15601561
if (!sysfs_kdamond->refresh_ms)
15611562
return 0;
1562-
if (time_before(jiffies, next_update_jiffies))
1563+
if (time_before(jiffies, damon_sysfs_next_update_jiffies))
15631564
return 0;
1564-
next_update_jiffies = jiffies +
1565+
damon_sysfs_next_update_jiffies = jiffies +
15651566
msecs_to_jiffies(sysfs_kdamond->refresh_ms);
15661567

15671568
if (!mutex_trylock(&damon_sysfs_lock))
@@ -1607,6 +1608,9 @@ static int damon_sysfs_turn_damon_on(struct damon_sysfs_kdamond *kdamond)
16071608
}
16081609
kdamond->damon_ctx = ctx;
16091610

1611+
damon_sysfs_next_update_jiffies =
1612+
jiffies + msecs_to_jiffies(kdamond->refresh_ms);
1613+
16101614
repeat_call_control->fn = damon_sysfs_repeat_call_fn;
16111615
repeat_call_control->data = kdamond;
16121616
repeat_call_control->repeat = true;

0 commit comments

Comments
 (0)