mm/damon/sysfs-schemes: fix wrong DAMOS tried regions update timeout setup
authorSeongJae Park <sj@kernel.org>
Fri, 2 Feb 2024 19:19:56 +0000 (11:19 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 8 Feb 2024 05:20:36 +0000 (21:20 -0800)
DAMON sysfs interface's update_schemes_tried_regions command has a timeout
of two apply intervals of the DAMOS scheme.  Having zero value DAMOS
scheme apply interval means it will use the aggregation interval as the
value.  However, the timeout setup logic is mistakenly using the sampling
interval insted of the aggregartion interval for the case.  This could
cause earlier-than-expected timeout of the command.  Fix it.

Link: https://lkml.kernel.org/r/20240202191956.88791-1-sj@kernel.org
Fixes: 7d6fa31a2fd7 ("mm/damon/sysfs-schemes: add timeout for update_schemes_tried_regions")
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: <stable@vger.kernel.org> # 6.7.x
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/damon/sysfs-schemes.c

index 8dbaac6..dd2fb51 100644 (file)
@@ -2194,7 +2194,7 @@ static void damos_tried_regions_init_upd_status(
                sysfs_regions->upd_timeout_jiffies = jiffies +
                        2 * usecs_to_jiffies(scheme->apply_interval_us ?
                                        scheme->apply_interval_us :
-                                       ctx->attrs.sample_interval);
+                                       ctx->attrs.aggr_interval);
        }
 }