From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C4B33655E7; Wed, 9 Sep 2026 04:44:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788929084; cv=none; b=i39jf92XQMR99sLsXdizitZVURrja7Q+tbfquaZKkMwVMvFjbc88ArzwK54eOHtypOf0Eiz57n6j2Be/kln1E7NTUsckV8f6f8FplczxenEr5ZxhB4S8+nXMotnPo8hTEeDnieoL335zOLm0RM48l4FkW7BMqxuDG8CIKxXU+oc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788929084; c=relaxed/simple; bh=8dS+prIEtN9CDe1iAXydgJcfJkl+5lMz995kk0lHXxU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=szfGuKvHDbdshUB01m2Zn5sCB5eQfcInIEOR3Hs1R71ipmPChenHkAsmc4/dTpfOaHzWMRsWhU0L6H2Q8m3afGnUAfaATElLcMwOLZ3JwaJ0RyW2hPG4EHegBogIg1PhD8S7WnfMBG2GiwntEvxtfBtL+NnMmJdO4Rc9S4zBQTw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jSJi3wzO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jSJi3wzO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95C411F00A3A; Wed, 9 Sep 2026 04:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788929080; bh=hf3KYGpwtphOc8lYhgZtMc8MBCdolbyCriTMGo1y7oY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jSJi3wzOaYVOUc9hh6587tWyAaqfoCwJcIQj+Q5f+PvTJVMQi+6EciN/Vil0ZSk7x K+oNiTp6inSoOOZNnppaXMLpIN2UR7DDR0DLEEcykzWYs4FhkxmTlMuQs0iaOX1CpO 0QPmVXTQW/aWpHlguXOgBcfQOUqAvzYoBXoowsuHUaYX7ab1cYGI0y9ESKnu+058uM AoMChYCAs6FiZbQBQnEY1WamoILS3jxhiIHBUSyuH3tpKdYvXgXd64FiuyPfpk5Lb8 mc/wX6MFjbxaurhK7stMyhws9quR6D9i9RbFgTmCNJZusrJ+zVkS9v2QYBimorI36d qLJO0+ztaqUpw== From: SJ Park To: stable@vger.kernel.org Cc: damon@lists.linux.dev, SJ Park , Andrew Morton Subject: [PATCH 6.1.y] mm/damon/core: skip aging from repeated aggressive merging Date: Tue, 8 Sep 2026 21:44:33 -0700 Message-ID: <20260909044433.218263-1-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <2026090841-catfight-alkalize-108d@gregkh> References: <2026090841-catfight-alkalize-108d@gregkh> Precedence: bulk X-Mailing-List: damon@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The number of DAMON regions could temporarily exceed the user-defined maximum number of regions limit for corner cases. For example, users could lower the limit via runtime parameters update. For such a case, kdamond_merge_regions() repeats merging regions in the case doubling the merge threshold. The repeated merge operation could update the age of regions multiple times. This corrupts the monitoring results. Fix the issue by asking the merge operation to skip aging for the corner case. The user impact is degradation of the monitoring quality. The impact should be mild, since the degradation is only temporal, and it is not common to happen in realistic setups. The issue was discovered [1,2] by Sashiko. Link: https://lore.kernel.org/20260712165432.87609-1-sj@kernel.org Link: https://lore.kernel.org/20260621203548.10718-1-sj@kernel.org [1] Link: https://lore.kernel.org/20260709145425.96247-1-sj@kernel.org [2] Fixes: 310d6c15e910 ("mm/damon/core: merge regions aggressively when max_nr_regions is unmet") Signed-off-by: SJ Park Cc: # 6.10 Signed-off-by: Andrew Morton (cherry picked from commit 0250dbe08c730d003ef9f484da56ae09a1ea0c4c) Signed-off-by: SJ Park --- mm/damon/core-test.h | 2 +- mm/damon/core.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mm/damon/core-test.h b/mm/damon/core-test.h index d8fef225930a5..cbdf3c8e45c75 100644 --- a/mm/damon/core-test.h +++ b/mm/damon/core-test.h @@ -250,7 +250,7 @@ static void damon_test_merge_regions_of(struct kunit *test) damon_add_region(r, t); } - damon_merge_regions_of(t, 9, 9999); + damon_merge_regions_of(t, 9, 9999, true); /* 0-112, 114-130, 130-156, 156-170 */ KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 5u); for (i = 0; i < 5; i++) { diff --git a/mm/damon/core.c b/mm/damon/core.c index dd4eafe8b9611..859a6a636ab0e 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -940,15 +940,17 @@ static void damon_merge_two_regions(struct damon_target *t, * sz_limit size upper limit of each region */ static void damon_merge_regions_of(struct damon_target *t, unsigned int thres, - unsigned long sz_limit) + unsigned long sz_limit, bool count_age) { struct damon_region *r, *prev = NULL, *next; damon_for_each_region_safe(r, next, t) { - if (abs(r->nr_accesses - r->last_nr_accesses) > thres) - r->age = 0; - else - r->age++; + if (count_age) { + if (abs(r->nr_accesses - r->last_nr_accesses) > thres) + r->age = 0; + else + r->age++; + } if (prev && prev->ar.end == r->ar.start && abs(prev->nr_accesses - r->nr_accesses) <= thres && @@ -982,15 +984,18 @@ static void kdamond_merge_regions(struct damon_ctx *c, unsigned int threshold, struct damon_target *t; unsigned int nr_regions; unsigned int max_thres; + bool count_age = true; 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) { - damon_merge_regions_of(t, threshold, sz_limit); + damon_merge_regions_of(t, threshold, sz_limit, + count_age); nr_regions += damon_nr_regions(t); } + count_age = false; threshold = max(1, threshold * 2); } while (nr_regions > c->attrs.max_nr_regions && threshold / 2 < max_thres); -- 2.47.3