mm-damon-sysfs-implement-damos-tried-regions-update-command.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs: implement DAMOS tried regions update command
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-implement-damos-tried-regions-update-command.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon/sysfs: implement DAMOS tried regions update command
Date: Tue, 1 Nov 2022 22:03:24 +0000
Implement the code for filling the data of 'tried_regions' DAMON sysfs directory. With this commit, DAMON sysfs interface users can write a special keyword, 'update_schemes_tried_regions' to the corresponding 'state' file of the kdamond. Then, DAMON sysfs interface will collect the tried regions information using the 'before_damos_apply()' callback for one aggregation interval and populate scheme region directories with the values.
---
mm/damon/sysfs-common.h | 6 ++ mm/damon/sysfs-schemes.c | 80 +++++++++++++++++++++++++++++++++++++ mm/damon/sysfs.c | 57 +++++++++++++++++++++++++- 3 files changed, 141 insertions(+), 2 deletions(-)
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-sysfs-implement-damos-tried-regions-update-command +55 -2
@@ -1000,6 +1000,11 @@ enum damon_sysfs_cmd {*/ DAMON_SYSFS_CMD_UPDATE_SCHEMES_STATS ,/* +* @DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS: Update schemes tried +* regions +*/ +DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS , +/* * @NR_DAMON_SYSFS_CMDS: Total number of DAMON sysfs commands. */ NR_DAMON_SYSFS_CMDS,
@@ -1011,6 +1016,7 @@ static const char * const damon_sysfs_cm"off" ,"commit" ,"update_schemes_stats" , + "update_schemes_tried_regions", };/*
@@ -1193,6 +1199,16 @@ static int damon_sysfs_set_targets(strucstatic void damon_sysfs_before_terminate (struct damon_ctx *ctx) {struct damon_target *t, *next; +struct damon_sysfs_kdamond *kdamond; + +/* damon_sysfs_schemes_update_regions_stop() might not yet called */ + kdamond = damon_sysfs_cmd_request.kdamond; +if (kdamond && damon_sysfs_cmd_request.cmd == +DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS && + ctx == kdamond->damon_ctx) { +damon_sysfs_schemes_update_regions_stop (ctx); +mutex_unlock (&damon_sysfs_lock); + }if (!damon_target_has_pid (ctx))return ;
@@ -1225,6 +1241,27 @@ static int damon_sysfs_upd_schemes_statsreturn 0 ; } +static int damon_sysfs_upd_schemes_regions_start ( +struct damon_sysfs_kdamond *kdamond) +{ +struct damon_ctx *ctx = kdamond->damon_ctx; + +if (!ctx) +return -EINVAL ; +return damon_sysfs_schemes_update_regions_start ( + kdamond->contexts->contexts_arr[0 ]->schemes, ctx); +} + +static int damon_sysfs_upd_schemes_regions_stop ( +struct damon_sysfs_kdamond *kdamond) +{ +struct damon_ctx *ctx = kdamond->damon_ctx; + +if (!ctx) +return -EINVAL ; +return damon_sysfs_schemes_update_regions_stop (ctx); +} +static inline bool damon_sysfs_kdamond_running (struct damon_sysfs_kdamond *kdamond) {
@@ -1277,10 +1314,12 @@ static int damon_sysfs_commit_input(strustatic int damon_sysfs_cmd_request_callback (struct damon_ctx *c) {struct damon_sysfs_kdamond *kdamond; +static bool damon_sysfs_schemes_regions_updating;int err =0 ;/* avoid deadlock due to concurrent state_store('off') */ -if (!mutex_trylock (&damon_sysfs_lock)) +if (!damon_sysfs_schemes_regions_updating && + !mutex_trylock (&damon_sysfs_lock))return 0 ; kdamond = damon_sysfs_cmd_request.kdamond;if (!kdamond || kdamond->damon_ctx != c)
@@ -1292,13 +1331,27 @@ static int damon_sysfs_cmd_request_callbcase DAMON_SYSFS_CMD_COMMIT : err =damon_sysfs_commit_input (kdamond);break ; +case DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS : +if (!damon_sysfs_schemes_regions_updating) { + err =damon_sysfs_upd_schemes_regions_start (kdamond); +if (!err) { + damon_sysfs_schemes_regions_updating = true; + goto keep_lock_out; + } + }else { + err =damon_sysfs_upd_schemes_regions_stop (kdamond); + damon_sysfs_schemes_regions_updating = false; + } +break ;default :break ; }/* Mark the request as invalid now. */ damon_sysfs_cmd_request.kdamond =NULL ; out: -mutex_unlock (&damon_sysfs_lock); +if (!damon_sysfs_schemes_regions_updating) +mutex_unlock (&damon_sysfs_lock); +keep_lock_out:return err; }
mm/damon/sysfs-common.h renamed from mm/damon/sysfs-common.h~mm-damon-sysfs-implement-damos-tried-regions-update-command +6 -0
@@ -44,3 +44,9 @@ int damon_sysfs_set_schemes(struct damonvoid damon_sysfs_schemes_update_stats (struct damon_sysfs_schemes *sysfs_schemes,struct damon_ctx *ctx); + +int damon_sysfs_schemes_update_regions_start ( +struct damon_sysfs_schemes *sysfs_schemes, +struct damon_ctx *ctx); + +int damon_sysfs_schemes_update_regions_stop (struct damon_ctx *ctx);
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-sysfs-implement-damos-tried-regions-update-command +80 -0
83 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are