The quilt patch titled
Subject: mm/damon/core: increase regions merge aggressiveness while respecting min_nr_regions
has been removed from the -mm tree. Its filename was
mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet-fix.patch
This patch was dropped because it was folded into mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet.patch
------------------------------------------------------
From: SeongJae Park <sj@xxxxxxxxxx>
Subject: mm/damon/core: increase regions merge aggressiveness while respecting min_nr_regions
Date: Wed, 26 Jun 2024 09:47:53 -0700
DAMON's merge mechanism has two thresholds, namely those for access
frequency and size. The access frequency threshold avoids merging two
adjacent regions that having pretty different access frequency.
The size threshold is calculated as total size of regions divided by
min_nr_regions. Merging operation skip merging two adjacent regions if
the resulting region's size can be larger than the threshold. This is for
meeting min_nr_regions.
Commit 44fdaf596984 ("mm/damon/core: merge regions aggressively when
max_nr_regions is unmet") of mm-unstable, however, ignores the
min_nr_regions by increasing not only access frequency threshold but also
the size threshold.
The commit also has one more problem. User could set DAMON target regions
with more than max_nr_regions discrete regions. Because DAMON cannot
merge non-adjacent regions, the number of regions will never be lower than
max_nr_regions regardless of the increased thresholds. As a result, the
function can infinitely repeat the loop.
Increase only access frequency threshold, up to only possible maximum
value.
Link: https://lkml.kernel.org/r/20240626164753.46270-1-sj@xxxxxxxxxx
Fixes: 44fdaf596984 ("mm/damon/core: merge regions aggressively when max_nr_regions is unmet") # mm-unstable
Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/damon/core.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
--- a/mm/damon/core.c~mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet-fix
+++ a/mm/damon/core.c
@@ -1359,20 +1359,21 @@ static void damon_merge_regions_of(struc
* overhead under the dynamically changeable access pattern. If a merge was
* unnecessarily made, later 'kdamond_split_regions()' will revert it.
*
- * The total number of regions could be temporarily higher than the
- * user-defined limit, max_nr_regions for some cases. For an example, the user
- * updates max_nr_regions to a number that lower than the current number of
- * regions while DAMON is running. Depending on the access pattern, it could
- * take indefinitve time to reduce the number below the limit. For such a
- * case, repeat merging until the limit is met while increasing @threshold and
- * @sz_limit.
+ * The total number of regions could be higher than the user-defined limit,
+ * max_nr_regions for some cases. For example, the user can update
+ * max_nr_regions to a number that lower than the current number of regions
+ * while DAMON is running. For such a case, repeat merging until the limit is
+ * met while increasing @threshold up to possible maximum level.
*/
static void kdamond_merge_regions(struct damon_ctx *c, unsigned int threshold,
unsigned long sz_limit)
{
struct damon_target *t;
unsigned int nr_regions;
+ unsigned int max_thres;
+ max_thres = c->attrs.aggr_interval /
+ (c->attrs.sample_interval ? c->attrs.sample_interval : 1);
do {
nr_regions = 0;
damon_for_each_target(t, c) {
@@ -1380,8 +1381,8 @@ static void kdamond_merge_regions(struct
nr_regions += damon_nr_regions(t);
}
threshold = max(1, threshold * 2);
- sz_limit = max(1, sz_limit * 2);
- } while (nr_regions > c->attrs.max_nr_regions);
+ } while (nr_regions > c->attrs.max_nr_regions &&
+ threshold <= max_thres);
}
/*
_
Patches currently in -mm which might be from sj@xxxxxxxxxx are
mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet.patch
mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet-fix-2.patch
mm-damon-paddr-initialize-nr_succeeded-in-__damon_pa_migrate_folio_list.patch
docs-mm-damon-design-fix-two-typos.patch
docs-mm-damon-design-clarify-regions-merging-operation.patch
docs-admin-guide-mm-damon-start-add-access-pattern-snapshot-example.patch
docs-mm-damon-design-add-links-from-overall-architecture-to-sections-of-details.patch
docs-mm-damon-design-move-configurable-operations-set-section-into-operations-set-layer-section.patch
docs-mm-damon-design-remove-programmable-modules-section-in-favor-of-modules-section.patch
docs-mm-damon-design-add-links-to-sections-of-damon-sysfs-interface-usage-doc.patch
docs-mm-damon-index-add-links-to-design.patch
docs-mm-damon-index-add-links-to-admin-guide-doc.patch
