mm/damon: support multiple goal-based quota tuning algorithms
Subsystems (5)
SeongJae Park
maintainercover mm/damon: support multiple goal-based quota tuning algorithms
Aim-oriented DAMOS quota auto-tuning uses a single tuning algorithm. The algorithm is designed to find a quota value that should be consistently kept for achieving the aimed goal for long term. It is useful and reliable at automatically operating systems that have dynamic environments in the long term.
As always, however, no single algorithm fits all. When the environment has static characteristics or there are control towers in not only the kernel space but also the user space, the algorithm shows some limitations. In such environments, users want kernel work in a more short term deterministic way. Actually there were at least two reports [1,2] of such cases.
Extend DAMOS quotas goal to support multiple quota tuning algorithms that users can select. Keep the current algorithm as the default one, to not break the old users. Also give it a name, "consist", as it is designed to "consistently" apply the DAMOS action. And introduce a new tuning algorithm, namely "temporal". It is designed to apply the DAMOS action only temporally, in a deterministic way. In more detail, as long as the goal is under-achieved, it uses the maximum quota available. Once the goal is over-achieved, it sets the quota zero.
Tests
=====
I confirmed the feature is working as expected using the latest version of DAMON user-space tool, like below.
$ # start DAMOS for reclaiming memory aiming 30% free memory
$ sudo ./damo/damo start --damos_action pageout \
--damos_quota_goal_tuner temporal \
--damos_quota_goal node_mem_free_bp 30% 0 \
--damos_quota_interval 1s \
--damos_quota_space 100MNote that >=3.1.8 version of DAMON user-space tool supports this feature (--damos_quota_goal_tuner). As expected, DAMOS stops reclaiming memory as soon as the goal amount of free memory is made. When 'consist' tuner is used, the reclamation was continued even after the goal amount of free memory is made, resulting in more than goal amount of free memory, as expected.
Patch Sequence
==============
First four patches implement the features. Patch 1 extends core API to allow multiple tuners and make the current tuner as the default and only available tuner, namely 'consist'. Patch 2 allows future tuners setting zero effective quota. Patch 3 introduces the second tuner, namely 'temporal'. Patch 4 further extends DAMON sysfs API to let users use that.
Three following patches (patches 5-7) update design, usage, and ABI documents, respectively.
Final four patches (patches 8-11) are for adding tests. The eighth patch (patch 8) extends the kunit test for online parameters commit for validating the goal_tuner. The ninth and the tenth patches (patches 9-10) extend the testing-purpose DAMON sysfs control helper and DAMON status dumping tool to support the newly added feature. The final eleventh one (patch 11) extends the existing online commit selftest to cover the new feature.
References
==========
[1] https://lore.kernel.org/CALa+Y17__d=ZsM1yX+MXx0ozVdsXnFqF4p0g+kATEitrWyZFfg@mail.gmail.com
[2] https://lore.kernel.org/[email protected]
Changelog
=========
Changes from RFC v2
(https://lore.kernel.org/[email protected])
- Rename damos_quota_set() to damos_quota_is_set().
- Drop unnecessary ->goal_tuner set on damos_new_quota().
- Add kunit test.
- Add goal_tuenr kernel-doc comment.
Changes from RFC v1
(https://lore.kernel.org/[email protected])
- Add selftest for goal_tuner commitment.
- Set goal tuner inside damon_new_scheme().
- Allow zero size effective size quota.
- Update the ABI document.
- Wordsmith change descriptions.
SeongJae Park (11):
mm/damon/core: introduce damos_quota_goal_tuner mm/damon/core: allow quota goals set zero effective size quota mm/damon/core: introduce DAMOS_QUOTA_GOAL_TUNER_TEMPORAL mm/damon/sysfs-schemes: implement quotas->goal_tuner file Docs/mm/damon/design: document the goal-based quota tuner selections Docs/admin-guide/mm/damon/usage: document goal_tuner sysfs file Docs/ABI/damon: update for goal_tuner mm/damon/tests/core-kunit: test goal_tuner commit selftests/damon/_damon_sysfs: support goal_tuner setup selftests/damon/drgn_dump_damon_status: support quota goal_tuner
dumping
selftests/damon/sysfs.py: test goal_tuner commit
.../ABI/testing/sysfs-kernel-mm-damon | 6 ++ Documentation/admin-guide/mm/damon/usage.rst | 16 +++-- Documentation/mm/damon/design.rst | 12 ++++ include/linux/damon.h | 12 ++++ mm/damon/core.c | 61 ++++++++++++++++--- mm/damon/sysfs-schemes.c | 58 ++++++++++++++++++ mm/damon/tests/core-kunit.h | 3 + tools/testing/selftests/damon/_damon_sysfs.py | 12 +++- .../selftests/damon/drgn_dump_damon_status.py | 1 + tools/testing/selftests/damon/sysfs.py | 7 +++ 10 files changed, 171 insertions(+), 17 deletions(-)
base-commit: 65dad07b05cbdda486d599772f908f1df45dd306
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 1/11 mm/damon/core: introduce damos_quota_goal_tuner
DAMOS quota goal feature utilizes a single feedback loop based algorithm for automatic tuning of the effective quota. It is useful in dynamic environments that operate systems with only kernels in the long term. But, no one fits all. It is not very easy to control in environments having more controlled characteristics and user-space control towers. We actually got multiple reports [1,2] of use cases that the algorithm is not optimal.
Introduce a new field of 'struct damos_quotas', namely 'goal_tuner'. It specifies what tuning algorithm the given scheme should use, and allows DAMON API callers to set it as they want. Nonetheless, this commit introduces no new tuning algorithm but only the interface. This commit hence makes no behavioral change. A new algorithm will be added by the following commit.
[1] https://lore.kernel.org/CALa+Y17__d=ZsM1yX+MXx0ozVdsXnFqF4p0g+kATEitrWyZFfg@mail.gmail.com
[2] https://lore.kernel.org/[email protected]
--- include/linux/damon.h | 10 ++++++++++ mm/damon/core.c | 1 + 2 files changed, 11 insertions(+)
include/linux/damon.h +10 -0
@@ -215,12 +215,21 @@ struct damos_quota_goal {struct list_head list; }; +/** +* enum damos_quota_goal_tuner - Goal-based quota tuning logic. +* @DAMOS_QUOTA_GOAL_TUNER_CONSIST: Aim long term consistent quota. +*/ +enum damos_quota_goal_tuner { +DAMOS_QUOTA_GOAL_TUNER_CONSIST , +}; +/** * struct damos_quota - Controls the aggressiveness of the given scheme. * @reset_interval: Charge reset interval in milliseconds. * @ms: Maximum milliseconds that the scheme can use. * @sz: Maximum bytes of memory that the action can be applied. * @goals: Head of quota tuning goals (&damos_quota_goal) list. +* @goal_tuner: Goal-based @esz tuning algorithm to use. * @esz: Effective size quota in bytes. * * @weight_sz: Weight of the region's size for prioritization.
@@ -262,6 +271,7 @@ struct damos_quota {unsigned long ms;unsigned long sz;struct list_head goals; +enum damos_quota_goal_tuner goal_tuner;unsigned long esz;unsigned int weight_sz;
mm/damon/core.c +1 -0
@@ -912,6 +912,7 @@ static int damos_commit_quota(struct damos_quota *dst, struct damos_quota *src) err =damos_commit_quota_goals (dst, src);if (err)return err; + dst->goal_tuner = src->goal_tuner; dst->weight_sz = src->weight_sz; dst->weight_nr_accesses = src->weight_nr_accesses; dst->weight_age = src->weight_age;
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 2/11 mm/damon/core: allow quota goals set zero effective size quota
In reply to SeongJae ParkUser-explicit quotas (size and time quotas) having zero value means the quotas are unset. And, effective size quota is set as the minimum value of the explicit quotas. When quota goals are set, the goal-based quota tuner can make it lower. But the existing only single tuner never sets the effective size quota zero. Because of the fact, DAMON core assumes zero effective quota means the user has set no quota.
Multiple tuners are now allowed, though. In the future, some tuners might want to set a zero effective size quota. There is no reason to restrict that. Meanwhile, because of the current implementation, it will only deactivate all quotas and make the scheme work at its full speed.
Introduce a dedicated function for checking if no quota is set. The function checks the fact by showing if the user-set explicit quotas are zero and no goal is installed. It is decoupled from zero effective quota, and hence allows future tuners set zero effective quota for intentionally deactivating the scheme by a purpose.
--- mm/damon/core.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
mm/damon/core.c +26 -5
@@ -387,6 +387,11 @@ void damos_destroy_quota_goal(struct damos_quota_goal *g)damos_free_quota_goal (g); } +static bool damos_quota_goals_empty (struct damos_quota *q) +{ +return list_empty (&q->goals); +} +/* initialize fields of @quota that normally API users wouldn't set */ static struct damos_quota *damos_quota_init (struct damos_quota *quota) {
@@ -1789,12 +1794,24 @@ static bool __damos_valid_target(struct damon_region *r, struct damos *s) r->age <= s->pattern.max_age_region; } +/* +* damos_quota_is_set() - Return if the given quota is actually set. +* @quota: The quota to check. +* +* Returns true if the quota is set, false otherwise. +*/ +static bool damos_quota_is_set (struct damos_quota *quota) +{ +return quota->esz || quota->sz || quota->ms || + !damos_quota_goals_empty (quota); +} +static bool damos_valid_target (struct damon_ctx *c,struct damon_region *r,struct damos *s) {bool ret =__damos_valid_target (r, s); -if (!ret || !s->quota.esz || !c->ops.get_scheme_score) +if (!ret || !damos_quota_is_set (&s->quota) || !c->ops.get_scheme_score)return ret;return c->ops.get_scheme_score (c, r, s) >= s->quota.min_score;
@@ -2064,7 +2081,8 @@ static void damos_apply_scheme(struct damon_ctx *c, struct damon_target *t, }if (c->ops.apply_scheme) { -if (quota->esz && quota->charged_sz + sz > quota->esz) { +if (damos_quota_is_set (quota) && + quota->charged_sz + sz > quota->esz) { sz =ALIGN_DOWN (quota->esz - quota->charged_sz, c->min_region_sz);if (!sz)
@@ -2083,7 +2101,8 @@ static void damos_apply_scheme(struct damon_ctx *c, struct damon_target *t, quota->total_charged_ns +=timespec64_to_ns (&end) -timespec64_to_ns (&begin); quota->charged_sz += sz; -if (quota->esz && quota->charged_sz >= quota->esz) { +if (damos_quota_is_set (quota) && + quota->charged_sz >= quota->esz) { quota->charge_target_from = t; quota->charge_addr_from = r->ar.end +1 ; }
@@ -2111,7 +2130,8 @@ static void damon_do_apply_schemes(struct damon_ctx *c,continue ;/* Check the quota */ -if (quota->esz && quota->charged_sz >= quota->esz) +if (damos_quota_is_set (quota) && + quota->charged_sz >= quota->esz)continue ;if (damos_skip_charged_region (t, r, s, c->min_region_sz))
@@ -2396,7 +2416,8 @@ static void damos_adjust_quota(struct damon_ctx *c, struct damos *s)/* 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) +if (damos_quota_is_set (quota) && + quota->charged_sz >= quota->esz) s->stat.qt_exceeds++; quota->total_charged_sz += quota->charged_sz; quota->charged_from = jiffies;
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 3/11 mm/damon/core: introduce DAMOS_QUOTA_GOAL_TUNER_TEMPORAL
In reply to SeongJae ParkIntroduce a new goal-based DAMOS quota auto-tuning algorithm, namely DAMOS_QUOTA_GOAL_TUNER_TEMPORAL (temporal in short). The algorithm aims to trigger the DAMOS action only for a temporal time, to achieve the goal as soon as possible. For the temporal period, it uses as much quota as allowed. Once the goal is achieved, it sets the quota zero, so effectively makes the scheme be deactivated.
--- include/linux/damon.h | 2 ++ mm/damon/core.c | 29 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-)
include/linux/damon.h +2 -0
@@ -218,9 +218,11 @@ struct damos_quota_goal {/** * enum damos_quota_goal_tuner - Goal-based quota tuning logic. * @DAMOS_QUOTA_GOAL_TUNER_CONSIST: Aim long term consistent quota. +* @DAMOS_QUOTA_GOAL_TUNER_TEMPORAL: Aim zero quota asap. */ enum damos_quota_goal_tuner {DAMOS_QUOTA_GOAL_TUNER_CONSIST , +DAMOS_QUOTA_GOAL_TUNER_TEMPORAL , };/**
mm/damon/core.c +24 -5
@@ -2345,6 +2345,26 @@ static unsigned long damos_quota_score(struct damos_quota *quota)return highest_score; } +static void damos_goal_tune_esz_bp_consist (struct damos_quota *quota) +{ +unsigned long score =damos_quota_score (quota); + + quota->esz_bp =damon_feed_loop_next_input ( +max (quota->esz_bp,10000UL ), score); +} + +static void damos_goal_tune_esz_bp_temporal (struct damos_quota *quota) +{ +unsigned long score =damos_quota_score (quota); + +if (score >=10000 ) + quota->esz_bp =0 ; +else if (quota->sz) + quota->esz_bp = quota->sz *10000 ; +else + quota->esz_bp =ULONG_MAX ; +} +/* * Called only if quota->ms, or quota->sz are set, or quota->goals is not empty */
@@ -2359,11 +2379,10 @@ static void damos_set_effective_quota(struct damos_quota *quota) }if (!list_empty ("a->goals)) { -unsigned long score =damos_quota_score (quota); - - quota->esz_bp =damon_feed_loop_next_input ( -max (quota->esz_bp,10000UL ), - score); +if (quota->goal_tuner ==DAMOS_QUOTA_GOAL_TUNER_CONSIST ) +damos_goal_tune_esz_bp_consist (quota); +else if (quota->goal_tuner ==DAMOS_QUOTA_GOAL_TUNER_TEMPORAL ) +damos_goal_tune_esz_bp_temporal (quota); esz = quota->esz_bp /10000 ; }
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 4/11 mm/damon/sysfs-schemes: implement quotas->goal_tuner file
In reply to SeongJae ParkAdd a new DAMON sysfs interface file, namely 'goal_tuner' under the DAMOS quotas directory. It is connected to the damos_quota->goal_tuner field. Users can therefore select their favorite goal-based quotas tuning algorithm by writing the name of the tuner to the file. Reading the file returns the name of the currently selected tuner.
--- mm/damon/sysfs-schemes.c | 58 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
mm/damon/sysfs-schemes.c +58 -0
@@ -1488,6 +1488,7 @@ struct damon_sysfs_quotas {unsigned long sz;unsigned long reset_interval_ms;unsigned long effective_sz;/* Effective size quota in bytes */ +enum damos_quota_goal_tuner goal_tuner; };static struct damon_sysfs_quotas *damon_sysfs_quotas_alloc (void )
@@ -1610,6 +1611,58 @@ static ssize_t effective_bytes_show(struct kobject *kobj,return sysfs_emit (buf,"%lu\n" , quotas->effective_sz); } +struct damos_sysfs_qgoal_tuner_name { +enum damos_quota_goal_tuner tuner; +char *name; +}; + +static struct damos_sysfs_qgoal_tuner_name damos_sysfs_qgoal_tuner_names[] = { + { + .tuner =DAMOS_QUOTA_GOAL_TUNER_CONSIST , + .name ="consist" , + }, + { + .tuner =DAMOS_QUOTA_GOAL_TUNER_TEMPORAL , + .name ="temporal" , + }, +}; + +static ssize_t goal_tuner_show (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) +{ +struct damon_sysfs_quotas *quotas =container_of (kobj, + struct damon_sysfs_quotas, kobj); +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_qgoal_tuner_names); i++) { +struct damos_sysfs_qgoal_tuner_name *tuner_name; + + tuner_name = &damos_sysfs_qgoal_tuner_names[i]; +if (tuner_name->tuner == quotas->goal_tuner) +return sysfs_emit (buf,"%s\n" , tuner_name->name); + } +return -EINVAL ; +} + +static ssize_t goal_tuner_store (struct kobject *kobj, +struct kobj_attribute *attr,const char *buf,size_t count) +{ +struct damon_sysfs_quotas *quotas =container_of (kobj, + struct damon_sysfs_quotas, kobj); +int i; + +for (i =0 ; i <ARRAY_SIZE (damos_sysfs_qgoal_tuner_names); i++) { +struct damos_sysfs_qgoal_tuner_name *tuner_name; + + tuner_name = &damos_sysfs_qgoal_tuner_names[i]; +if (sysfs_streq (buf, tuner_name->name)) { + quotas->goal_tuner = tuner_name->tuner; +return count; + } + } +return -EINVAL ; +} +static void damon_sysfs_quotas_release (struct kobject *kobj) {kfree (container_of(kobj ,struct damon_sysfs_quotas ,kobj ));
@@ -1627,11 +1680,15 @@ static struct kobj_attribute damon_sysfs_quotas_reset_interval_ms_attr =static struct kobj_attribute damon_sysfs_quotas_effective_bytes_attr =__ATTR_RO_MODE (effective_bytes,0400 ); +static struct kobj_attribute damon_sysfs_quotas_goal_tuner_attr = +__ATTR_RW_MODE (goal_tuner,0600 ); +static struct attribute *damon_sysfs_quotas_attrs[] = { &damon_sysfs_quotas_ms_attr.attr, &damon_sysfs_quotas_sz_attr.attr, &damon_sysfs_quotas_reset_interval_ms_attr.attr, &damon_sysfs_quotas_effective_bytes_attr.attr, + &damon_sysfs_quotas_goal_tuner_attr.attr,NULL , };ATTRIBUTE_GROUPS (damon_sysfs_quotas);
@@ -2718,6 +2775,7 @@ static struct damos *damon_sysfs_mk_scheme( .weight_sz = sysfs_weights->sz, .weight_nr_accesses = sysfs_weights->nr_accesses, .weight_age = sysfs_weights->age, + .goal_tuner = sysfs_quotas->goal_tuner, };struct damos_watermarks wmarks = { .metric = sysfs_wmarks->metric,
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 5/11 Docs/mm/damon/design: document the goal-based quota tuner selections
In reply to SeongJae ParkUpdate the design document for the newly added goal-based quota tuner selection feature.
--- Documentation/mm/damon/design.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/mm/damon/design.rst +12 -0
@@ -566,6 +566,18 @@ aggressiveness (the quota) of the corresponding scheme. For example, if DAMOS is under achieving the goal, DAMOS automatically increases the quota. If DAMOS is over achieving the goal, it decreases the quota. +There are two such tuning algorithms that users can select as they need. + +- ``consist``: A proportional feedback loop based algorithm. Tries to find an + optimum quota that should be consistently kept, to keep achieving the goal. + Useful for kernel-only operation on dynamic and long-running environments. + This is the default selection. If unsure, use this. +- ``temporal``: More straightforward algorithm. Tries to achieve the goal as + fast as possible, using maximum allowed quota, but only for a temporal short + time. When the quota is under-achieved, this algorithm keeps tuning quota to + a maximum allowed one. Once the quota is [over]-achieved, this sets the + quota zero. Useful for deterministic control required environments. + The goal can be specified with five parameters, namely ``target_metric``, ``target_value``, ``current_value``, ``nid`` and ``path``. The auto-tuning mechanism tries to make ``current_value`` of ``target_metric`` be same to
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 6/11 Docs/admin-guide/mm/damon/usage: document goal_tuner sysfs file
In reply to SeongJae ParkUpdate the DAMON usage document for the new sysfs file for the goal based quota auto-tuning algorithm selection.
--- Documentation/admin-guide/mm/damon/usage.rst | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
Documentation/admin-guide/mm/damon/usage.rst +12 -4
@@ -83,7 +83,7 @@ comma (","). │ │ │ │ │ │ │ │ sz/min,max │ │ │ │ │ │ │ │ nr_accesses/min,max │ │ │ │ │ │ │ │ age/min,max - │ │ │ │ │ │ │ :ref:`quotas <sysfs_quotas>`/ms,bytes,reset_interval_ms,effective_bytes + │ │ │ │ │ │ │ :ref:`quotas <sysfs_quotas>`/ms,bytes,reset_interval_ms,effective_bytes,goal_tuner │ │ │ │ │ │ │ │ weights/sz_permil,nr_accesses_permil,age_permil │ │ │ │ │ │ │ │ :ref:`goals <sysfs_schemes_quota_goals>`/nr_goals │ │ │ │ │ │ │ │ │ 0/target_metric,target_value,current_value,nid,path
@@ -377,9 +377,9 @@ schemes/<N>/quotas/ The directory for the :ref:`quotas <damon_design_damos_quotas>` of the given DAMON-based operation scheme. -Under ``quotas`` directory, four files (``ms``, ``bytes``, -``reset_interval_ms``, ``effective_bytes``) and two directories (``weights`` and -``goals``) exist. +Under ``quotas`` directory, five files (``ms``, ``bytes``, +``reset_interval_ms``, ``effective_bytes`` and ``goal_tuner``) and two +directories (``weights`` and ``goals``) exist. You can set the ``time quota`` in milliseconds, ``size quota`` in bytes, and ``reset interval`` in milliseconds by writing the values to the three files,
@@ -390,6 +390,14 @@ apply the action to only up to ``bytes`` bytes of memory regions within the quota limits unless at least one :ref:`goal <sysfs_schemes_quota_goals>` is set. +You can set the goal-based effective quota auto-tuning algorithm to use, by +writing the algorithm name to ``goal_tuner`` file. Reading the file returns +the currently selected tuner algorithm. Refer to the design documentation of +:ref:`automatic quota tuning goals <damon_design_damos_quotas_auto_tuning>` for +the background design of the feature and the name of the selectable algorithms. +Refer to :ref:`goals directory <sysfs_schemes_quota_goals>` for the goals +setup. + The time quota is internally transformed to a size quota. Between the transformed size quota and user-specified size quota, smaller one is applied. Based on the user-specified :ref:`goal <sysfs_schemes_quota_goals>`, the
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 7/11 Docs/ABI/damon: update for goal_tuner
In reply to SeongJae ParkUpdate the ABI document for the newly added goal_tuner sysfs file.
--- Documentation/ABI/testing/sysfs-kernel-mm-damon | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/ABI/testing/sysfs-kernel-mm-damon +6 -0
@@ -316,6 +316,12 @@ Contact: SeongJae Park <[email protected]> Description: Writing to and reading from this file sets and gets the path parameter of the goal. +What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/goal_tuner +Date: Mar 2026 +Contact: SeongJae Park <[email protected]> +Description: Writing to and reading from this file sets and gets the + goal-based effective quota auto-tuning algorithm to use. + What: /sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/schemes/<S>/quotas/weights/sz_permil Date: Mar 2022 Contact: SeongJae Park <[email protected]>
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 8/11 mm/damon/tests/core-kunit: test goal_tuner commit
In reply to SeongJae ParkExtend damos_commit_quota() kunit test for the newly added goal_tuner parameter.
--- mm/damon/tests/core-kunit.h | 3 +++ 1 file changed, 3 insertions(+)
mm/damon/tests/core-kunit.h +3 -0
@@ -693,6 +693,7 @@ static void damos_test_commit_quota(struct kunit *test) .reset_interval = 1, .ms = 2, .sz = 3, + .goal_tuner = DAMOS_QUOTA_GOAL_TUNER_CONSIST, .weight_sz = 4, .weight_nr_accesses = 5, .weight_age = 6,
@@ -701,6 +702,7 @@ static void damos_test_commit_quota(struct kunit *test) .reset_interval = 7, .ms = 8, .sz = 9, + .goal_tuner = DAMOS_QUOTA_GOAL_TUNER_TEMPORAL, .weight_sz = 10, .weight_nr_accesses = 11, .weight_age = 12,
@@ -714,6 +716,7 @@ static void damos_test_commit_quota(struct kunit *test)KUNIT_EXPECT_EQ (test, dst.reset_interval, src.reset_interval);KUNIT_EXPECT_EQ (test, dst.ms, src.ms);KUNIT_EXPECT_EQ (test, dst.sz, src.sz); +KUNIT_EXPECT_EQ (test, dst.goal_tuner, src.goal_tuner);KUNIT_EXPECT_EQ (test, dst.weight_sz, src.weight_sz);KUNIT_EXPECT_EQ (test, dst.weight_nr_accesses, src.weight_nr_accesses);KUNIT_EXPECT_EQ (test, dst.weight_age, src.weight_age);
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 9/11 selftests/damon/_damon_sysfs: support goal_tuner setup
In reply to SeongJae ParkAdd support of goal_tuner setup to the test-purpose DAMON sysfs interface control helper, _damon_sysfs.py.
--- tools/testing/selftests/damon/_damon_sysfs.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/testing/selftests/damon/_damon_sysfs.py +9 -3
@@ -130,15 +130,16 @@ class DamosQuota: sz = None # size quota, in bytes ms = None # time quota goals = None # quota goals + goal_tuner = None # quota goal tuner reset_interval_ms = None # quota reset interval weight_sz_permil = None weight_nr_accesses_permil = None weight_age_permil = None scheme = None # owner scheme - def __init__(self, sz=0, ms=0, goals=None, reset_interval_ms=0, - weight_sz_permil=0, weight_nr_accesses_permil=0, - weight_age_permil=0): + def __init__(self, sz=0, ms=0, goals=None, goal_tuner='consist', + reset_interval_ms=0, weight_sz_permil=0, + weight_nr_accesses_permil=0, weight_age_permil=0): self.sz = sz self.ms = ms self.reset_interval_ms = reset_interval_ms
@@ -146,6 +147,7 @@ class DamosQuota: self.weight_nr_accesses_permil = weight_nr_accesses_permil self.weight_age_permil = weight_age_permil self.goals = goals if goals is not None else [] + self.goal_tuner = goal_tuner for idx, goal in enumerate(self.goals): goal.idx = idx goal.quota = self
@@ -191,6 +193,10 @@ class DamosQuota: err = goal.stage() if err is not None: return err + err = write_file( + os.path.join(self.sysfs_dir(), 'goal_tuner'), self.goal_tuner) + if err is not None: + return err return None class DamosWatermarks:
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 10/11 selftests/damon/drgn_dump_damon_status: support quota goal_tuner dumping
In reply to SeongJae ParkUpdate drgn_dump_damon_status.py, which is being used to dump the in-kernel DAMON status for tests, to dump goal_tuner setup status.
--- tools/testing/selftests/damon/drgn_dump_damon_status.py | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/damon/drgn_dump_damon_status.py +1 -0
@@ -110,6 +110,7 @@ def damos_quota_to_dict(quota): ['reset_interval', int], ['ms', int], ['sz', int], ['goals', damos_quota_goals_to_list], + ['goal_tuner', int], ['esz', int], ['weight_sz', int], ['weight_nr_accesses', int],
Signature · 1 line
2.47.3
SeongJae Park
maintainerPATCH 11/11 selftests/damon/sysfs.py: test goal_tuner commit
In reply to SeongJae ParkExtend the near-full DAMON parameters commit selftest to commit goal_tuner and confirm the internal status is updated as expected.
--- tools/testing/selftests/damon/sysfs.py | 7 +++++++ 1 file changed, 7 insertions(+)
tools/testing/selftests/damon/sysfs.py +7 -0
@@ -67,6 +67,12 @@ def assert_quota_committed(quota, dump): assert_true(dump['sz'] == quota.sz, 'sz', dump) for idx, qgoal in enumerate(quota.goals): assert_quota_goal_committed(qgoal, dump['goals'][idx]) + tuner_val = { + 'consist': 0, + 'temporal': 1, + } + assert_true(dump['goal_tuner'] == tuner_val[quota.goal_tuner], + 'goal_tuner', dump) assert_true(dump['weight_sz'] == quota.weight_sz_permil, 'weight_sz', dump) assert_true(dump['weight_nr_accesses'] == quota.weight_nr_accesses_permil, 'weight_nr_accesses', dump)
@@ -231,6 +237,7 @@ def main(): metric='node_mem_used_bp', target_value=9950, nid=1)], + goal_tuner='temporal', reset_interval_ms=1500, weight_sz_permil=20, weight_nr_accesses_permil=200,
Signature · 1 line
2.47.3