mm-damon-sysfs-deduplicate-inputs-applying.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/sysfs: deduplicate inputs applying
has been removed from the -mm tree. Its filename was
mm-damon-sysfs-deduplicate-inputs-applying.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: deduplicate inputs applying
Date: Mon, 6 Jun 2022 18:23:08 +0000
DAMON sysfs interface's DAMON context building and its online parameter update have duplicated code. This commit removes the duplicate.
---
mm/damon/sysfs.c | 59 ++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 35 deletions(-)
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-sysfs-deduplicate-inputs-applying +24 -35
@@ -2357,6 +2357,23 @@ static inline bool damon_sysfs_kdamond_rdamon_sysfs_ctx_running (kdamond->damon_ctx); } +static int damon_sysfs_apply_inputs (struct damon_ctx *ctx, +struct damon_sysfs_context *sys_ctx) +{ +int err; + + err =damon_select_ops (ctx, sys_ctx->ops_id); +if (err) +return err; + err =damon_sysfs_set_attrs (ctx, sys_ctx->attrs); +if (err) +return err; + err =damon_sysfs_set_targets (ctx, sys_ctx->targets); +if (err) +return err; +return damon_sysfs_set_schemes (ctx, sys_ctx->schemes); +} +/* * damon_sysfs_commit_input() - Commit user inputs to a running kdamond. * @kdamond: The kobject wrapper for the associated kdamond.
@@ -2365,31 +2382,14 @@ static inline bool damon_sysfs_kdamond_r*/ static int damon_sysfs_commit_input (struct damon_sysfs_kdamond *kdamond) { -struct damon_ctx *ctx = kdamond->damon_ctx; -struct damon_sysfs_context *sys_ctx; -int err =0 ; -if (!damon_sysfs_kdamond_running (kdamond))return -EINVAL ;/* TODO: Support multiple contexts per kdamond */ if (kdamond->contexts->nr !=1 )return -EINVAL ; - sys_ctx = kdamond->contexts->contexts_arr[0 ]; - - err =damon_select_ops (ctx, sys_ctx->ops_id); -if (err) -return err; - err =damon_sysfs_set_attrs (ctx, sys_ctx->attrs); -if (err) -return err; - err =damon_sysfs_set_targets (ctx, sys_ctx->targets); -if (err) -return err; - err =damon_sysfs_set_schemes (ctx, sys_ctx->schemes); -if (err) -return err; -return err; +return damon_sysfs_apply_inputs (kdamond->damon_ctx, + kdamond->contexts->contexts_arr[0 ]); }/*
@@ -2436,27 +2436,16 @@ static struct damon_ctx *damon_sysfs_buiif (!ctx)return ERR_PTR (-ENOMEM ); - err =damon_select_ops (ctx, sys_ctx->ops_id); -if (err) - goto out; - err =damon_sysfs_set_attrs (ctx, sys_ctx->attrs); -if (err) - goto out; - err =damon_sysfs_set_targets (ctx, sys_ctx->targets); -if (err) - goto out; - err =damon_sysfs_set_schemes (ctx, sys_ctx->schemes); -if (err) - goto out; + err =damon_sysfs_apply_inputs (ctx, sys_ctx); +if (err) { +damon_destroy_ctx (ctx); +return ERR_PTR (err); + } ctx->callback.after_wmarks_check = damon_sysfs_cmd_request_callback; ctx->callback.after_aggregation = damon_sysfs_cmd_request_callback; ctx->callback.before_terminate = damon_sysfs_before_terminate;return ctx; - -out: -damon_destroy_ctx (ctx); -return ERR_PTR (err); }static int damon_sysfs_turn_damon_on (struct damon_sysfs_kdamond *kdamond)
_
Patches currently in -mm which might be from [email protected] are
mm-damon-reclaim-make-enabled-checking-timer-simpler.patch mm-damon-reclaim-add-damon_reclaim_-prefix-to-enabled_store.patch mm-damon-dbgfs-add-and-use-mappings-between-schemes-action-inputs-and-damos_action-values.patch mm-damon-paddr-use-a-separate-function-for-damos_pageout-handling.patch mm-damon-schemes-add-lru_prio-damos-action.patch docs-admin-guide-damon-sysfs-document-lru_prio-scheme-action.patch mm-damon-schemes-add-lru_deprio-action.patch docs-admin-guide-damon-sysfs-document-lru_deprio-scheme-action.patch mm-damon-introduce-damon-based-lru-lists-sorting.patch docs-admin-guide-damon-add-a-document-for-damon_lru_sort.patch