Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/damon/sysfs: use damon_call() for update_schemes_stats 

DAMON sysfs interface uses damon_callback with its own synchronization
facility to handle update_schemes_stats kdamond command.  But damon_call()
can support the use case without the additional synchronizations.  Convert
the code to use damon_call() instead.

Link: https://lkml.kernel.org/r/20250103174400.54890-5-sj@kernel.org
Signed-off-by: SeongJae Park <sj@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
SeongJae Park 2025-01-03 09:43:54 -08:00 committed by Andrew Morton
parent 42b7491af1
commit f64539dcdb
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mm/damon/sysfs.c
View File

@ -1214,19 +1214,19 @@ static void damon_sysfs_before_terminate(struct damon_ctx *ctx)
/* /*
* damon_sysfs_upd_schemes_stats() - Update schemes stats sysfs files. * damon_sysfs_upd_schemes_stats() - Update schemes stats sysfs files.
* @kdamond: The kobject wrapper that associated to the kdamond thread. * @data: The kobject wrapper that associated to the kdamond thread.
* *
* This function reads the schemes stats of specific kdamond and update the * This function reads the schemes stats of specific kdamond and update the
* related values for sysfs files. This function should be called from DAMON * related values for sysfs files. This function should be called from DAMON
* callbacks while holding ``damon_syfs_lock``, to safely access the DAMON * worker thread,to safely access the DAMON contexts-internal data. Caller
* contexts-internal data and DAMON sysfs variables. * should also ensure holding ``damon_syfs_lock``, and ->damon_ctx of @data is
* not NULL but a valid pointer, to safely access DAMON sysfs variables.
*/ */
static int damon_sysfs_upd_schemes_stats(struct damon_sysfs_kdamond *kdamond) static int damon_sysfs_upd_schemes_stats(void *data)
{ {
struct damon_sysfs_kdamond *kdamond = data;
struct damon_ctx *ctx = kdamond->damon_ctx; struct damon_ctx *ctx = kdamond->damon_ctx;
if (!ctx)
return -EINVAL;
damon_sysfs_schemes_update_stats( damon_sysfs_schemes_update_stats(
kdamond->contexts->contexts_arr[0]->schemes, ctx); kdamond->contexts->contexts_arr[0]->schemes, ctx);
return 0; return 0;
@ -1371,9 +1371,6 @@ static int damon_sysfs_cmd_request_callback(struct damon_ctx *c, bool active,
if (!kdamond || kdamond->damon_ctx != c) if (!kdamond || kdamond->damon_ctx != c)
goto out; goto out;
switch (damon_sysfs_cmd_request.cmd) { switch (damon_sysfs_cmd_request.cmd) {
case DAMON_SYSFS_CMD_UPDATE_SCHEMES_STATS:
err = damon_sysfs_upd_schemes_stats(kdamond);
break;
case DAMON_SYSFS_CMD_COMMIT: case DAMON_SYSFS_CMD_COMMIT:
if (!after_aggregation) if (!after_aggregation)
goto out; goto out;
@ -1511,6 +1508,18 @@ static int damon_sysfs_turn_damon_off(struct damon_sysfs_kdamond *kdamond)
*/ */
} }
static int damon_sysfs_damon_call(int (*fn)(void *data),
struct damon_sysfs_kdamond *kdamond)
{
struct damon_call_control call_control = {};
if (!kdamond->damon_ctx)
return -EINVAL;
call_control.fn = fn;
call_control.data = kdamond;
return damon_call(kdamond->damon_ctx, &call_control);
}
/* /*
* damon_sysfs_handle_cmd() - Handle a command for a specific kdamond. * damon_sysfs_handle_cmd() - Handle a command for a specific kdamond.
* @cmd: The command to handle. * @cmd: The command to handle.
@ -1529,12 +1538,14 @@ static int damon_sysfs_handle_cmd(enum damon_sysfs_cmd cmd,
{ {
bool need_wait = true; bool need_wait = true;
/* Handle commands that doesn't access DAMON context-internal data */
switch (cmd) { switch (cmd) {
case DAMON_SYSFS_CMD_ON: case DAMON_SYSFS_CMD_ON:
return damon_sysfs_turn_damon_on(kdamond); return damon_sysfs_turn_damon_on(kdamond);
case DAMON_SYSFS_CMD_OFF: case DAMON_SYSFS_CMD_OFF:
return damon_sysfs_turn_damon_off(kdamond); return damon_sysfs_turn_damon_off(kdamond);
case DAMON_SYSFS_CMD_UPDATE_SCHEMES_STATS:
return damon_sysfs_damon_call(
damon_sysfs_upd_schemes_stats, kdamond);
case DAMON_SYSFS_CMD_CLEAR_SCHEMES_TRIED_REGIONS: case DAMON_SYSFS_CMD_CLEAR_SCHEMES_TRIED_REGIONS:
return damon_sysfs_schemes_clear_regions( return damon_sysfs_schemes_clear_regions(
kdamond->contexts->contexts_arr[0]->schemes); kdamond->contexts->contexts_arr[0]->schemes);