mm-damon-core-split-out-scheme-quota-adjustment-logic-into-a-new-function.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/core: split out scheme quota adjustment logic into a new function
has been removed from the -mm tree. Its filename was
mm-damon-core-split-out-scheme-quota-adjustment-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 out scheme quota adjustment logic into a new function
Date: Wed, 26 Oct 2022 22:59:35 +0000
DAMOS quota adjustment logic in 'kdamond_apply_schemes()', has some amount of code, and the logic is not so straightforward. Split it out to a new function for better readability.
---
mm/damon/core.c | 91 ++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 43 deletions(-)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-core-split-out-scheme-quota-adjustment-logic-into-a-new-function +48 -43
@@ -848,6 +848,53 @@ static void damos_set_effective_quota(st quota->esz = esz; } +static void damos_adjust_quota (struct damon_ctx *c,struct damos *s) +{ +struct damos_quota *quota = &s->quota; +struct damon_target *t; +struct damon_region *r; +unsigned long cumulated_sz; +unsigned int score, max_score =0 ; + +if (!quota->ms && !quota->sz) +return ; + +/* New charge window starts */ +if (time_after_eq (jiffies, quota->charged_from + +msecs_to_jiffies (quota->reset_interval))) { +if (quota->esz && quota->charged_sz >= quota->esz) + s->stat.qt_exceeds++; + quota->total_charged_sz += quota->charged_sz; + quota->charged_from = jiffies; + quota->charged_sz =0 ; +damos_set_effective_quota (quota); + } + +if (!c->ops.get_scheme_score) +return ; + +/* Fill up the score histogram */ +memset (quota->histogram,0 ,sizeof (quota->histogram)); +damon_for_each_target (t, c) { +damon_for_each_region (r, t) { +if (!__damos_valid_target (r, s)) +continue ; + score = c->ops.get_scheme_score (c, t, r, s); + quota->histogram[score] +=damon_sz_region (r); +if (score > max_score) + max_score = score; + } + } + +/* Set the min score limit */ +for (cumulated_sz =0 , score = max_score; ; score--) { + cumulated_sz += quota->histogram[score]; +if (cumulated_sz >= quota->esz || !score) +break ; + } + quota->min_score = score; +} +static void kdamond_apply_schemes (struct damon_ctx *c) {struct damon_target *t;
@@ -855,52 +902,10 @@ static void kdamond_apply_schemes(structstruct damos *s;damon_for_each_scheme (s, c) { -struct damos_quota *quota = &s->quota; -unsigned long cumulated_sz; -unsigned int score, max_score =0 ; -if (!s->wmarks.activated)continue ; -if (!quota->ms && !quota->sz) -continue ; - -/* New charge window starts */ -if (time_after_eq (jiffies, quota->charged_from + -msecs_to_jiffies ( - quota->reset_interval))) { -if (quota->esz && quota->charged_sz >= quota->esz) - s->stat.qt_exceeds++; - quota->total_charged_sz += quota->charged_sz; - quota->charged_from = jiffies; - quota->charged_sz =0 ; -damos_set_effective_quota (quota); - } - -if (!c->ops.get_scheme_score) -continue ; - -/* Fill up the score histogram */ -memset (quota->histogram,0 ,sizeof (quota->histogram)); -damon_for_each_target (t, c) { -damon_for_each_region (r, t) { -if (!__damos_valid_target (r, s)) -continue ; - score = c->ops.get_scheme_score ( - c, t, r, s); - quota->histogram[score] +=damon_sz_region (r); -if (score > max_score) - max_score = score; - } - } - -/* Set the min score limit */ -for (cumulated_sz =0 , score = max_score; ; score--) { - cumulated_sz += quota->histogram[score]; -if (cumulated_sz >= quota->esz || !score) -break ; - } - quota->min_score = score; +damos_adjust_quota (c, s); }damon_for_each_target (t, c) {
_
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