mm-damon-core-split-damos-application-logic-into-a-new-function.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/core: split damos application logic into a new function
has been removed from the -mm tree. Its filename was
mm-damon-core-split-damos-application-logic-into-a-new-function.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/core: split damos application logic into a new function
Date: Wed, 26 Oct 2022 22:59:33 +0000
The DAMOS action applying function, 'damon_do_apply_schemes()', is still long and not easy to read. Split out the code for applying a single action to a single region into a new function for better readability.
---
mm/damon/core.c | 73 ++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 34 deletions(-)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-core-split-damos-application-logic-into-a-new-function +39 -34
@@ -755,6 +755,44 @@ static bool damos_skip_charged_region(streturn false; } +static void damos_apply_scheme (struct damon_ctx *c,struct damon_target *t, +struct damon_region *r,struct damos *s) +{ +struct damos_quota *quota = &s->quota; +unsigned long sz =damon_sz_region (r); +struct timespec64 begin, end; +unsigned long sz_applied =0 ; + +if (c->ops.apply_scheme) { +if (quota->esz && quota->charged_sz + sz > quota->esz) { + sz =ALIGN_DOWN (quota->esz - quota->charged_sz, +DAMON_MIN_REGION ); +if (!sz) + goto update_stat; +damon_split_region_at (t, r, sz); + } +ktime_get_coarse_ts64 (&begin); + sz_applied = c->ops.apply_scheme (c, t, r, s); +ktime_get_coarse_ts64 (&end); + quota->total_charged_ns +=timespec64_to_ns (&end) - +timespec64_to_ns (&begin); + quota->charged_sz += sz; +if (quota->esz && quota->charged_sz >= quota->esz) { + quota->charge_target_from = t; + quota->charge_addr_from = r->ar.end +1 ; + } + } +if (s->action !=DAMOS_STAT ) + r->age =0 ; + +update_stat: + s->stat.nr_tried++; + s->stat.sz_tried += sz; +if (sz_applied) + s->stat.nr_applied++; + s->stat.sz_applied += sz_applied; +} +static void damon_do_apply_schemes (struct damon_ctx *c,struct damon_target *t,struct damon_region *r)
@@ -763,9 +801,6 @@ static void damon_do_apply_schemes(strucdamon_for_each_scheme (s, c) {struct damos_quota *quota = &s->quota; -unsigned long sz; -struct timespec64 begin, end; -unsigned long sz_applied =0 ;if (!s->wmarks.activated)continue ;
@@ -780,37 +815,7 @@ static void damon_do_apply_schemes(strucif (!damos_valid_target (c, t, r, s))continue ; -/* Apply the scheme */ - sz =damon_sz_region (r); -if (c->ops.apply_scheme) { -if (quota->esz && - quota->charged_sz + sz > quota->esz) { - sz =ALIGN_DOWN (quota->esz - quota->charged_sz, -DAMON_MIN_REGION ); -if (!sz) - goto update_stat; -damon_split_region_at (t, r, sz); - } -ktime_get_coarse_ts64 (&begin); - sz_applied = c->ops.apply_scheme (c, t, r, s); -ktime_get_coarse_ts64 (&end); - quota->total_charged_ns +=timespec64_to_ns (&end) - -timespec64_to_ns (&begin); - quota->charged_sz += sz; -if (quota->esz && quota->charged_sz >= quota->esz) { - quota->charge_target_from = t; - quota->charge_addr_from = r->ar.end +1 ; - } - } -if (s->action !=DAMOS_STAT ) - r->age =0 ; - -update_stat: - s->stat.nr_tried++; - s->stat.sz_tried += sz; -if (sz_applied) - s->stat.nr_applied++; - s->stat.sz_applied += sz_applied; +damos_apply_scheme (c, t, r, s); } }
_
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