mm-damon-tests-core-kunit-skip-damon_test_nr_accesses_to_accesses_bp-if-aggr_interval-is-zero.patch removed from -mm tree
The quilt patch titled
Subject: mm/damon/tests/core-kunit: skip damon_test_nr_accesses_to_accesses_bp() if aggr_interval is zero
has been removed from the -mm tree. Its filename was
mm-damon-tests-core-kunit-skip-damon_test_nr_accesses_to_accesses_bp-if-aggr_interval-is-zero.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/tests/core-kunit: skip damon_test_nr_accesses_to_accesses_bp() if aggr_interval is zero
Date: Thu, 5 Sep 2024 09:24:23 -0700
The aggregation interval of test purpose damon_attrs for damon_test_nr_accesses_to_accesses_bp() becomes zero on 32 bit architecture, since size of int and long types are same. As a result, damon_nr_accesses_to_accesses_bp() call with the test data triggers divide-by-zero exception. damon_nr_accesses_to_accesses_bp() shouldn't be called with such data, and the non-test code avoids that by checking the case on damon_update_monitoring_results(). Skip the test code in the case, and add an explicit caution of the case on the comment for the test target function.
---
mm/damon/core.c | 8 +++++++- mm/damon/tests/core-kunit.h | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-tests-core-kunit-skip-damon_test_nr_accesses_to_accesses_bp-if-aggr_interval-is-zero +7 -1
@@ -552,7 +552,13 @@ static unsigned int damon_accesses_bp_toreturn accesses_bp *damon_max_nr_accesses (attrs) /10000 ; } -/* convert nr_accesses to access ratio in bp (per 10,000) */ +/* +* Convert nr_accesses to access ratio in bp (per 10,000). +* +* Callers should ensure attrs.aggr_interval is not zero, like +* damon_update_monitoring_results() does . Otherwise, divide-by-zero would +* happen. +*/ static unsigned int damon_nr_accesses_to_accesses_bp (unsigned int nr_accesses,struct damon_attrs *attrs) {
mm/damon/tests/core-kunit.h renamed from mm/damon/tests/core-kunit.h~mm-damon-tests-core-kunit-skip-damon_test_nr_accesses_to_accesses_bp-if-aggr_interval-is-zero +12 -0
@@ -320,6 +320,18 @@ static void damon_test_nr_accesses_to_ac .aggr_interval = ((unsigned long)UINT_MAX + 1) * 10 }; +/* +* In some cases such as 32bit architectures where UINT_MAX is +* ULONG_MAX, attrs.aggr_interval becomes zero. Calling +* damon_nr_accesses_to_accesses_bp() in the case will cause +* divide-by-zero. Such case is prohibited in normal execution since +* the caution is documented on the comment for the function, and +* damon_update_monitoring_results() does the check. Skip the test in +* the case. +*/ +if (!attrs.aggr_interval) +kunit_skip (test,"aggr_interval is zero." ); +KUNIT_EXPECT_EQ (test,damon_nr_accesses_to_accesses_bp (123 , &attrs),0 ); }
_
Patches currently in -mm which might be from [email protected] are