mm/damon: fix the temporal goal tuner's size quota conversion
Subsystems (4)
SJ Park
maintainerv5 cover mm/damon: fix the temporal goal tuner's size quota conversion
From: Donggeun Yoo <[email protected]>
damos_goal_tune_esz_bp_temporal() hands the size quota to damos_set_effective_quota() through quota->esz_bp in basis points, and the multiply that gets it there is unchecked. On 32-bit it wraps above 429496 bytes, and a wrapped product below 10000 divides to a zero effective quota. damos_quota_is_full() is then true on the first test of every charge window, so the scheme makes no progress for as long as the goal is unachieved.
Patch 1 bounds the conversion. Patch 2 pins the boundary in the core kunit suite, where the new test would fail without patch 1 on any word size.
Changes in v5
- v4: https://lore.kernel.org/[email protected]
- Collec R-b: from SJ for patch 1.
- Rebase to the latest mm-new.
Changes in v4, from SJ Park's review of v2; the code is unchanged:
- patch 1: drop the 256 MiB mention
- patch 1: say what the user sees before saying the setup is unlikely
- patch 1: cut the closing paragraph to "Bound the multiply."
- patch 2: unchanged, and carries the Reviewed-by
v3: https://lore.kernel.org/damon/[email protected]/
v2: https://lore.kernel.org/damon/[email protected]/
v3 was posted before the discussion on v2 had finished. My mistake; this version was held until the thread settled.
DAMON kunit on x86_64: 39 tests, all passing with both patches; 38 passing and damos_test_esz_goal_temporal failing with patch 2 alone.
Donggeun Yoo (2):
mm/damon/core: prevent size quota overflow in the temporal goal tuner mm/damon/tests/core-kunit: test the temporal tuner's size quota
conversion
mm/damon/core.c | 2 +- mm/damon/tests/core-kunit.h | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-)
base-commit: 2fbc36fcb37d79b22b904066065952050a7ea307
Signature · 1 line
2.47.3
SJ Park
maintainerPATCH v5 1/2 mm/damon/core: prevent size quota overflow in the temporal goal tuner
From: Donggeun Yoo <[email protected]>
damos_goal_tune_esz_bp_temporal() converts the scheme's size quota into basis points with "quota->esz_bp = quota->sz * 10000", both unsigned long, and damos_set_effective_quota() divides the result back by 10000. quotas/bytes is unbounded; bytes_store() hands it to kstrtoul() as is.
On 32-bit the product wraps for any size quota above ULONG_MAX / 10000, that is 429496 bytes. A wrapped product below 10000 divides to a zero effective quota: 429497 gives 0. damos_quota_is_full() is then true on the first test of every charge window. Other wrapped values are wrong without being zero: 500000 gives 70503.
Triggering this needs a scheme with a quota goal, the temporal goal tuner, and a size quota above ULONG_MAX / 10000 -- 429496 bytes on 32-bit, 1844674407370955 on 64-bit. The scheme then makes no progress for as long as the goal is unachieved, which is easy to notice, and writing a smaller size quota restores it. Nothing is corrupted and nothing leaks. This is unlikely to be hit on a tested setup.
addr_unit does not cover this. It only scales the numbers a paddr context writes to quotas/bytes, so a large enough scaled value wraps just the same, and vaddr and fvaddr contexts take raw byte values.
Bound the multiply.
--- mm/damon/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/core.c +1 -1
@@ -3291,7 +3291,7 @@ static void damos_goal_tune_esz_bp_temporal(struct damon_ctx *c,if (score >=10000 ) quota->esz_bp =0 ; -else if (quota->sz) +else if (quota->sz && quota->sz <=ULONG_MAX /10000 ) quota->esz_bp = quota->sz *10000 ;else quota->esz_bp =ULONG_MAX ;
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v5 1/2] mm/damon/core: prevent size quota overflow in the temporal goal tuner
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 14 lines
From: Donggeun Yoo <[email protected]>
damos_goal_tune_esz_bp_temporal()converts the scheme's size quota into basis points with "quota->esz_bp=quota->sz* 10000", both unsigned long, anddamos_set_effective_quota()divides the result back by 10000. quotas/bytes is unbounded;bytes_store()hands it tokstrtoul()as is.On 32-bit the product wraps for any size quota above
ULONG_MAX/ 10000, that is 429496 bytes. A wrapped product below 10000 divides to a zero effective quota: 429497 gives 0.damos_quota_is_full()is then true on the first test of every charge window. Other wrapped values are wrong without being zero: 500000 gives 70503.
Quoted 7 lines
Triggering this needs a scheme with a quota goal, the temporal goal
[ ... ]Fixes af738a6a00c1 ("mm/damon/core: introduce DAMOS_QUOTA_GOAL_TUNER_TEMPORAL")Cc <[email protected]> # 7.1.xSigned-off-by Donggeun Yoo <[email protected]>Reviewed-by SJ Park <[email protected]>Signed-off-by SJ Park <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
SJ Park
maintainerPATCH v5 2/2 mm/damon/tests/core-kunit: test the temporal tuner's size quota conversion
In reply to SJ ParkFrom: Donggeun Yoo <[email protected]>
damos_goal_tune_esz_bp_temporal() encodes the size quota in basis points, so the conversion is exact only up to ULONG_MAX / 10000. Pin the three sizes around that boundary: the largest one that fits, the first one that does not, and ULONG_MAX.
--- mm/damon/tests/core-kunit.h | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
mm/damon/tests/core-kunit.h +48 -0
@@ -2284,6 +2284,53 @@ static void damon_test_rand(struct kunit *test) } } +static void damos_test_esz_goal_temporal (struct kunit *test) +{ +struct damos_access_pattern pattern = {}; +struct damos_watermarks wmarks = {}; +struct damos_quota quota = { + .goal_tuner =DAMOS_QUOTA_GOAL_TUNER_TEMPORAL , + }; +struct damos_quota_goal *goal; +struct damon_ctx *ctx; +struct damos *s; + + ctx =damon_new_ctx (); +KUNIT_ASSERT_NOT_NULL (test, ctx); + + s =damon_new_scheme (&pattern,DAMOS_STAT ,0 , "a, &wmarks, +NUMA_NO_NODE ); +if (!s) { +damon_destroy_ctx (ctx); +kunit_skip (test,"scheme alloc fail" ); + } +damon_add_scheme (ctx, s); + + goal =damos_new_quota_goal (DAMOS_QUOTA_USER_INPUT ,10000 ); +if (!goal) { +damon_destroy_ctx (ctx); +kunit_skip (test,"quota goal alloc fail" ); + } + goal->current_value =0 ; +damos_add_quota_goal (&s->quota, goal); + +/* The largest size quota the basis-point conversion can hold. */ + s->quota.sz =ULONG_MAX /10000 ; +damos_set_effective_quota (ctx, s); +KUNIT_EXPECT_EQ (test, s->quota.esz,ULONG_MAX /10000 ); + +/* Any larger one saturates instead of wrapping. */ + s->quota.sz =ULONG_MAX /10000 +1 ; +damos_set_effective_quota (ctx, s); +KUNIT_EXPECT_EQ (test, s->quota.esz,ULONG_MAX /10000 ); + + s->quota.sz =ULONG_MAX ; +damos_set_effective_quota (ctx, s); +KUNIT_EXPECT_EQ (test, s->quota.esz,ULONG_MAX /10000 ); + +damon_destroy_ctx (ctx); +} +static struct kunit_case damon_test_cases[] = {KUNIT_CASE (damon_test_target),KUNIT_CASE (damon_test_regions),
@@ -2324,6 +2371,7 @@ static struct kunit_case damon_test_cases[] = {KUNIT_CASE (damon_test_is_last_region),KUNIT_CASE (damon_test_walk_control_obsolete),KUNIT_CASE (damon_test_rand), + KUNIT_CASE(damos_test_esz_goal_temporal), {}, };
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v5 2/2] mm/damon/tests/core-kunit: test the temporal tuner's size quota conversion
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 10 lines
From: Donggeun Yoo <[email protected]>
damos_goal_tune_esz_bp_temporal()encodes the size quota in basis points, so the conversion is exact only up toULONG_MAX/ 10000. Pin the three sizes around that boundary: the largest one that fits, the first one that does not, andULONG_MAX.Signed-off-by Donggeun Yoo <[email protected]>Reviewed-by SJ Park <[email protected]>Signed-off-by SJ Park <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2