mm-damon-modules-deduplicate-init-steps-for-damon-context-setup.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/modules: deduplicate init steps for DAMON context setup
has been removed from the -mm tree. Its filename was
mm-damon-modules-deduplicate-init-steps-for-damon-context-setup.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/modules: deduplicate init steps for DAMON context setup
Date: Wed, 26 Oct 2022 22:59:42 +0000
DAMON_RECLAIM and DAMON_LRU_SORT has duplicated code for DAMON context and target initializations. Deduplicate the part by implementing a function for the initialization in 'modules-common.c' and using it.
---
mm/damon/Makefile | 4 +-- mm/damon/lru_sort.c | 17 ++------------ mm/damon/modules-common.c | 42 ++++++++++++++++++++++++++++++++++++ mm/damon/modules-common.h | 3 ++ mm/damon/reclaim.c | 17 ++------------ 5 files changed, 53 insertions(+), 30 deletions(-)
mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-modules-deduplicate-init-steps-for-damon-context-setup +3 -14
@@ -314,25 +314,14 @@ static int damon_lru_sort_after_wmarks_cstatic int __init damon_lru_sort_init (void ) { - ctx =damon_new_ctx (); -if (!ctx) -return -ENOMEM ; +int err =damon_modules_new_paddr_ctx_target (&ctx, &target); -if (damon_select_ops (ctx,DAMON_OPS_PADDR )) { -damon_destroy_ctx (ctx); -return -EINVAL ; - } +if (err) +return err; ctx->callback.after_wmarks_check = damon_lru_sort_after_wmarks_check; ctx->callback.after_aggregation = damon_lru_sort_after_aggregation; - target =damon_new_target (); -if (!target) { -damon_destroy_ctx (ctx); -return -ENOMEM ; - } -damon_add_target (ctx, target); -schedule_delayed_work (&damon_lru_sort_timer,0 ); damon_lru_sort_initialized = true;
mm/damon/Makefile renamed from mm/damon/Makefile~mm-damon-modules-deduplicate-init-steps-for-damon-context-setup +2 -2
@@ -5,5 +5,5 @@ obj-$(CONFIG_DAMON_VADDR) += ops-common. obj-$(CONFIG_DAMON_PADDR) += ops-common.o paddr.o obj-$(CONFIG_DAMON_SYSFS) += sysfs-common.o sysfs-schemes.o sysfs.o obj-$(CONFIG_DAMON_DBGFS) += dbgfs.o -obj-$(CONFIG_DAMON_RECLAIM) += reclaim.o -obj-$(CONFIG_DAMON_LRU_SORT) += lru_sort.o +obj-$(CONFIG_DAMON_RECLAIM) += modules-common.o reclaim.o +obj-$(CONFIG_DAMON_LRU_SORT) += modules-common.o lru_sort.o
mm/damon/modules-common.c new file +42 -0
42 lines not on this page · raw message
mm/damon/modules-common.h renamed from mm/damon/modules-common.h~mm-damon-modules-deduplicate-init-steps-for-damon-context-setup +3 -0
@@ -44,3 +44,6 @@ 0400); \ module_param_named(nr_##qt_exceed_name, stat.qt_exceeds, ulong, \ 0400); + +int damon_modules_new_paddr_ctx_target (struct damon_ctx **ctxp, +struct damon_target **targetp);
mm/damon/reclaim.c renamed from mm/damon/reclaim.c~mm-damon-modules-deduplicate-init-steps-for-damon-context-setup +3 -14
@@ -256,25 +256,14 @@ static int damon_reclaim_after_wmarks_chstatic int __init damon_reclaim_init (void ) { - ctx =damon_new_ctx (); -if (!ctx) -return -ENOMEM ; +int err =damon_modules_new_paddr_ctx_target (&ctx, &target); -if (damon_select_ops (ctx,DAMON_OPS_PADDR )) { -damon_destroy_ctx (ctx); -return -EINVAL ; - } +if (err) +return err; ctx->callback.after_wmarks_check = damon_reclaim_after_wmarks_check; ctx->callback.after_aggregation = damon_reclaim_after_aggregation; - target =damon_new_target (); -if (!target) { -damon_destroy_ctx (ctx); -return -ENOMEM ; - } -damon_add_target (ctx, target); -schedule_delayed_work (&damon_reclaim_timer,0 ); damon_reclaim_initialized = true;
_
Patches currently in -mm which might be from [email protected] are
docs-admin-guide-mm-damon-usage-describe-the-rules-of-sysfs-region-directories.patch docs-admin-guide-mm-damon-usage-fix-wrong-usage-example-of-init_regions-file.patch mm-damon-core-add-a-callback-for-scheme-target-regions-check.patch mm-damon-sysfs-schemes-implement-schemes-tried_regions-directory.patch mm-damon-sysfs-schemes-implement-scheme-region-directory.patch mm-damon-sysfs-implement-damos-tried-regions-update-command.patch mm-damon-sysfs-schemes-implement-damos-tried-regions-clear-command.patch tools-selftets-damon-sysfs-test-tried_regions-directory-existence.patch docs-admin-guide-mm-damon-usage-document-schemes-s-tried_regions-sysfs-directory.patch docs-abi-damon-document-schemes-s-tried_regions-sysfs-directory.patch selftests-damon-test-non-context-inputs-to-rm_contexts-file.patch