mm-damon-sysfs-remove-unused-code-for-schemes-tried-regions-update.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs: remove unused code for schemes tried regions update
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-remove-unused-code-for-schemes-tried-regions-update.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: remove unused code for schemes tried regions update
Date: Fri, 3 Jan 2025 09:44:00 -0800
DAMON sysfs interface was using damon_callback with its own complicated synchronization logics to update DAMOS scheme applied regions directories and files. But it is replaced to use damos_walk(), and the additional synchronization logics are no more being used. Remove those.
---
mm/damon/sysfs-common.h | 10 - mm/damon/sysfs-schemes.c | 204 ------------------------------------- mm/damon/sysfs.c | 70 ------------ 3 files changed, 2 insertions(+), 282 deletions(-)
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-sysfs-remove-unused-code-for-schemes-tried-regions-update +2 -68
@@ -1181,25 +1181,9 @@ static int damon_sysfs_add_targets(strucreturn 0 ; } -static bool damon_sysfs_schemes_regions_updating; -static void damon_sysfs_before_terminate (struct damon_ctx *ctx) {struct damon_target *t, *next; -struct damon_sysfs_kdamond *kdamond; -enum damon_sysfs_cmd cmd; - -/* damon_sysfs_schemes_update_regions_stop() might not yet called */ - kdamond = damon_sysfs_cmd_request.kdamond; - cmd = damon_sysfs_cmd_request.cmd; -if (kdamond && ctx == kdamond->damon_ctx && - (cmd ==DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS || - cmd ==DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_BYTES ) && - damon_sysfs_schemes_regions_updating) { -damon_sysfs_schemes_update_regions_stop (ctx); - damon_sysfs_schemes_regions_updating = false; -mutex_unlock (&damon_sysfs_lock); - }if (!damon_target_has_pid (ctx))return ;
@@ -1232,28 +1216,6 @@ static int damon_sysfs_upd_schemes_statsreturn 0 ; } -static int damon_sysfs_upd_schemes_regions_start ( -struct damon_sysfs_kdamond *kdamond,bool total_bytes_only) -{ -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, - total_bytes_only); -} - -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) {
@@ -1358,12 +1320,10 @@ static int damon_sysfs_cmd_request_callb bool after_aggregation) {struct damon_sysfs_kdamond *kdamond; -bool total_bytes_only = false;int err =0 ;/* avoid deadlock due to concurrent state_store('off') */ -if (!damon_sysfs_schemes_regions_updating && - !mutex_trylock (&damon_sysfs_lock)) +if (!mutex_trylock (&damon_sysfs_lock))return 0 ; kdamond = damon_sysfs_cmd_request.kdamond;if (!kdamond || kdamond->damon_ctx != c)
@@ -1374,39 +1334,13 @@ static int damon_sysfs_cmd_request_callb goto out; err =damon_sysfs_commit_input (kdamond);break ; -case DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_BYTES : - total_bytes_only = true; - fallthrough; -case DAMON_SYSFS_CMD_UPDATE_SCHEMES_TRIED_REGIONS : -if (!damon_sysfs_schemes_regions_updating) { - err =damon_sysfs_upd_schemes_regions_start (kdamond, - total_bytes_only); -if (!err) { - damon_sysfs_schemes_regions_updating = true; - goto keep_lock_out; - } - }else { -damos_sysfs_mark_finished_regions_updates (c); -/* -* Continue regions updating if DAMON is till -* active and the update for all schemes is not -* finished. -*/ -if (active && !damos_sysfs_regions_upd_done ()) - goto keep_lock_out; - 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: -if (!damon_sysfs_schemes_regions_updating) -mutex_unlock (&damon_sysfs_lock); -keep_lock_out: +mutex_unlock (&damon_sysfs_lock);return err; }
mm/damon/sysfs-common.h renamed from mm/damon/sysfs-common.h~mm-damon-sysfs-remove-unused-code-for-schemes-tried-regions-update +0 -10
@@ -45,16 +45,6 @@ void 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,bool total_bytes_only); - -void damos_sysfs_mark_finished_regions_updates (struct damon_ctx *ctx); - -bool damos_sysfs_regions_upd_done (void ); - -int damon_sysfs_schemes_update_regions_stop (struct damon_ctx *ctx); - void damos_sysfs_populate_region_dir(struct damon_sysfs_schemes *sysfs_schemes, struct damon_ctx *ctx, struct damon_target *t, struct damon_region *r, struct damos *s,
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-sysfs-remove-unused-code-for-schemes-tried-regions-update +0 -204
236 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
docs-mm-damon-design-add-monitoring-parameters-tuning-guide.patch docs-mm-damon-add-an-example-monitoring-intervals-tuning.patch docs-admin-guide-mm-damon-usage-fix-and-add-missing-damos-filter-sysfs-files-on-files-hierarchy.patch docs-admin-guide-mm-damon-start-update-snapshot-example.patch mm-damon-explain-effective-quota-on-kernel-doc-comment.patch