mm/damon/sysfs: fix refresh_ms control overwriting on multi-kdamonds usages
Subsystems (2)
SeongJae Park
maintainercover mm/damon/sysfs: fix refresh_ms control overwriting on multi-kdamonds usages
Automatic esssential DAMON/DAMOS status update feature of DAMON sysfs interface (refresh_ms) is broken [1] for multiple DAMON contexts (kdamonds) use case, since it uses a global single damon_call_control object for all created DAMON contexts. The fields of the object, particularly the list field is over-written for the contexts and it makes unexpected results including user-space hangup and kernel crashes [2]. Fix it by extending damon_call_control for the use case and updating the usage on DAMON sysfs interface to use per-context dynamically allocated damon_call_control object.
[1] https://lore.kernel.org/[email protected]
[2] https://lore.kernel.org/[email protected]
SeongJae Park (2):
mm/damon/core: introduce damon_call_control->dealloc_on_cancel mm/damon/sysfs: use dynamically allocated repeat mode
damon_call_control
include/linux/damon.h | 2 ++ mm/damon/core.c | 8 ++++++-- mm/damon/sysfs.c | 23 +++++++++++++++-------- 3 files changed, 23 insertions(+), 10 deletions(-)
base-commit: c6680f5947fa5ff95bc881f2c4e36443478c8829
Signature · 1 line
2.39.5
SeongJae Park
maintainerPATCH 1/2 mm/damon/core: introduce damon_call_control->dealloc_on_cancel
When damon_call_control->repeat is set, damon_call() is executed asynchronously, and eventually be canceled when kdamond finishes. If the damon_call_control object is dynamically allocated, hence, finding the place to deallocate the object is difficult. Introduce a new damon_call_control field, namely dealloc_on_cancel, to ask the kdamond deallocates those dynamically allocated objects when those are canceled.
--- include/linux/damon.h | 2 ++ mm/damon/core.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
include/linux/damon.h +2 -0
@@ -636,6 +636,7 @@ struct damon_operations {* @data: Data that will be passed to @fn. * @repeat: Repeat invocations. * @return_code: Return code from @fn invocation. +* @dealloc_on_cancel: De-allocate when canceled. * * Control damon_call(), which requests specific kdamond to invoke a given * function. Refer to damon_call() for more details.
@@ -645,6 +646,7 @@ struct damon_call_control {void *data;bool repeat;int return_code; +bool dealloc_on_cancel;/* private: internal use only */ /* informs if the kdamond finished handling of the request */ struct completion completion;
mm/damon/core.c +6 -2
@@ -2510,10 +2510,14 @@ static void kdamond_call(struct damon_ctx *ctx, bool cancel)mutex_lock (&ctx->call_controls_lock);list_del (&control->list);mutex_unlock (&ctx->call_controls_lock); -if (!control->repeat) +if (!control->repeat) {complete (&control->completion); -else + }else if (control->canceled && control->dealloc_on_cancel) { +kfree (control); +continue ; + }else {list_add (&control->list, &repeat_controls); + } } control =list_first_entry_or_null (&repeat_controls, struct damon_call_control, list);
Signature · 1 line
2.39.5
SeongJae Park
maintainerPATCH 2/2 mm/damon/sysfs: use dynamically allocated repeat mode damon_call_control
In reply to SeongJae ParkDAMON sysfs interface is using a single global repeat mode damon_call_control variable for refresh_ms handling, for all DAMON contexts. As a result, when there are more than one context, the single global damon_call_control is unexpectedly over-written (corrupted). Particularly the ->link field is overwritten by the multiple contexts and this can cause a user hangup, and/or a kernel crash. Fix it by using dynamically allocated damon_call_control object per DAMON context.
--- mm/damon/sysfs.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
mm/damon/sysfs.c +15 -8
@@ -1569,14 +1569,10 @@ static int damon_sysfs_repeat_call_fn(void *data)return 0 ; } -static struct damon_call_control damon_sysfs_repeat_call_control = { - .fn = damon_sysfs_repeat_call_fn, - .repeat = true, -}; -static int damon_sysfs_turn_damon_on (struct damon_sysfs_kdamond *kdamond) {struct damon_ctx *ctx; +struct damon_call_control *repeat_call_control;int err;if (damon_sysfs_kdamond_running (kdamond))
@@ -1589,18 +1585,29 @@ static int damon_sysfs_turn_damon_on(struct damon_sysfs_kdamond *kdamond)damon_destroy_ctx (kdamond->damon_ctx); kdamond->damon_ctx =NULL ; + repeat_call_control =kmalloc (sizeof (*repeat_call_control), +GFP_KERNEL ); +if (!repeat_call_control) +return -ENOMEM ; + ctx =damon_sysfs_build_ctx (kdamond->contexts->contexts_arr[0 ]); -if (IS_ERR (ctx)) +if (IS_ERR (ctx)) { +kfree (repeat_call_control);return PTR_ERR (ctx); + } err =damon_start (&ctx,1 , false);if (err) { +kfree (repeat_call_control);damon_destroy_ctx (ctx);return err; } kdamond->damon_ctx = ctx; - damon_sysfs_repeat_call_control.data = kdamond; -damon_call (ctx, &damon_sysfs_repeat_call_control); + repeat_call_control->fn = damon_sysfs_repeat_call_fn; + repeat_call_control->data = kdamond; + repeat_call_control->repeat = true; + repeat_call_control->dealloc_on_cancel = true; +damon_call (ctx, repeat_call_control);return err; }
Signature · 1 line
2.39.5