| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251221130114.1483856-1-shu17az@gmail.com>
Date: Sun, 21 Dec 2025 13:01:14 +0000
From: Shu Anzai <shu17az@...il.com>
To: sj@...nel.org,
akpm@...ux-foundation.org
Cc: shu17az@...il.com,
yanquanmin1@...wei.com,
damon@...ts.linux.dev,
linux-mm@...ck.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] mm/damon/tests/core-kunit: extend test scenarios and remove redundancy
Add some missing test scenarios to cover a wider range of cases. Also,
remove a redundant case in damos_test_commit_quota_goal().
Signed-off-by: Shu Anzai <shu17az@...il.com>
---
mm/damon/tests/core-kunit.h | 51 ++++++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/mm/damon/tests/core-kunit.h b/mm/damon/tests/core-kunit.h
index f59ae7ee19a0..e9ccc3fb34f9 100644
--- a/mm/damon/tests/core-kunit.h
+++ b/mm/damon/tests/core-kunit.h
@@ -158,6 +158,7 @@ static void damon_test_split_at(struct kunit *test)
r->nr_accesses_bp = 420000;
r->nr_accesses = 42;
r->last_nr_accesses = 15;
+ r->age = 10;
damon_add_region(r, t);
damon_split_region_at(t, r, 25);
KUNIT_EXPECT_EQ(test, r->ar.start, 0ul);
@@ -170,6 +171,7 @@ static void damon_test_split_at(struct kunit *test)
KUNIT_EXPECT_EQ(test, r->nr_accesses_bp, r_new->nr_accesses_bp);
KUNIT_EXPECT_EQ(test, r->nr_accesses, r_new->nr_accesses);
KUNIT_EXPECT_EQ(test, r->last_nr_accesses, r_new->last_nr_accesses);
+ KUNIT_EXPECT_EQ(test, r->age, r_new->age);
damon_free_target(t);
}
@@ -190,6 +192,7 @@ static void damon_test_merge_two(struct kunit *test)
}
r->nr_accesses = 10;
r->nr_accesses_bp = 100000;
+ r->age = 9;
damon_add_region(r, t);
r2 = damon_new_region(100, 300);
if (!r2) {
@@ -198,12 +201,15 @@ static void damon_test_merge_two(struct kunit *test)
}
r2->nr_accesses = 20;
r2->nr_accesses_bp = 200000;
+ r2->age = 21;
damon_add_region(r2, t);
damon_merge_two_regions(t, r, r2);
KUNIT_EXPECT_EQ(test, r->ar.start, 0ul);
KUNIT_EXPECT_EQ(test, r->ar.end, 300ul);
KUNIT_EXPECT_EQ(test, r->nr_accesses, 16u);
+ KUNIT_EXPECT_EQ(test, r->nr_accesses_bp, 160000u);
+ KUNIT_EXPECT_EQ(test, r->age, 17u);
i = 0;
damon_for_each_region(r3, t) {
@@ -232,12 +238,12 @@ static void damon_test_merge_regions_of(struct kunit *test)
{
struct damon_target *t;
struct damon_region *r;
- unsigned long sa[] = {0, 100, 114, 122, 130, 156, 170, 184};
- unsigned long ea[] = {100, 112, 122, 130, 156, 170, 184, 230};
- unsigned int nrs[] = {0, 0, 10, 10, 20, 30, 1, 2};
+ unsigned long sa[] = {0, 100, 114, 122, 130, 156, 170, 184, 235, 240};
+ unsigned long ea[] = {100, 112, 122, 130, 156, 170, 184, 230, 240, 10235};
+ unsigned int nrs[] = {0, 0, 10, 10, 20, 30, 1, 2, 5, 5};
- unsigned long saddrs[] = {0, 114, 130, 156, 170};
- unsigned long eaddrs[] = {112, 130, 156, 170, 230};
+ unsigned long saddrs[] = {0, 114, 130, 156, 170, 235, 240};
+ unsigned long eaddrs[] = {112, 130, 156, 170, 230, 240, 10235};
int i;
t = damon_new_target();
@@ -255,9 +261,9 @@ static void damon_test_merge_regions_of(struct kunit *test)
}
damon_merge_regions_of(t, 9, 9999);
- /* 0-112, 114-130, 130-156, 156-170 */
- KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 5u);
- for (i = 0; i < 5; i++) {
+ /* 0-112, 114-130, 130-156, 156-170, 170-230, 235-240, 240-10235 */
+ KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 7u);
+ for (i = 0; i < 7; i++) {
r = __nth_region_of(t, i);
KUNIT_EXPECT_EQ(test, r->ar.start, saddrs[i]);
KUNIT_EXPECT_EQ(test, r->ar.end, eaddrs[i]);
@@ -269,6 +275,9 @@ static void damon_test_split_regions_of(struct kunit *test)
{
struct damon_target *t;
struct damon_region *r;
+ unsigned long sa[] = {0, 300, 500};
+ unsigned long ea[] = {220, 400, 700};
+ int i;
t = damon_new_target();
if (!t)
@@ -286,14 +295,19 @@ static void damon_test_split_regions_of(struct kunit *test)
t = damon_new_target();
if (!t)
kunit_skip(test, "second target alloc fail");
- r = damon_new_region(0, 220);
- if (!r) {
- damon_free_target(t);
- kunit_skip(test, "second region alloc fail");
+ for (i = 0; i < ARRAY_SIZE(sa); i++) {
+ r = damon_new_region(sa[i], ea[i]);
+ if (!r) {
+ damon_free_target(t);
+ kunit_skip(test, "region alloc fail");
+ }
+ damon_add_region(r, t);
+ }
+ damon_split_regions_of(t, 4, 5);
+ KUNIT_EXPECT_LE(test, damon_nr_regions(t), 12u);
+ damon_for_each_region(r, t) {
+ KUNIT_EXPECT_GE(test, damon_sz_region(r) % 5ul, 0ul);
}
- damon_add_region(r, t);
- damon_split_regions_of(t, 4, 1);
- KUNIT_EXPECT_LE(test, damon_nr_regions(t), 4u);
damon_free_target(t);
}
@@ -574,9 +588,10 @@ static void damos_test_commit_quota_goal(struct kunit *test)
});
damos_test_commit_quota_goal_for(test, &dst,
&(struct damos_quota_goal) {
- .metric = DAMOS_QUOTA_USER_INPUT,
- .target_value = 789,
- .current_value = 12,
+ .metric = DAMOS_QUOTA_SOME_MEM_PSI_US,
+ .target_value = 234,
+ .current_value = 345,
+ .last_psi_total = 567,
});
}
--
2.43.0
Powered by blists - more mailing lists