Commit 10e8c7ba authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton
Browse files

mm/damon/tests/core-kunit: remove DAMON_MIN_REGION redefinition 

A few DAMON core functions including damon_set_regions() were hard-coded
to use DAMON_MIN_REGION as their regions management granularity.  For
simple and human-readable unit tests' expectations, DAMON core layer kunit
test re-defines DAMON_MIN_REGION to '1'.

A previous patch series [1] has removed the hard-coded part but kept the
redefinition and updated related function calls to explicitly use
DAMON_MIN_REGION.  Remove the unnecessary redefinition and update relevant
function calls to pass literals (number '1') instead of the
DAMON_MIN_REGION.

Link: https://lkml.kernel.org/r/20251112154114.66053-7-sj@kernel.org
Link: https://lore.kernel.org/20250828171242.59810-1-sj@kernel.org

 [1]
Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Cc: Bill Wendling <morbo@google.com>
Cc: Brendan Higgins <brendan.higgins@linux.dev>
Cc: David Gow <davidgow@google.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Justin Stitt <justinstitt@google.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 09efc56a

mm/damon/core.c

+0 −5
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/damon.h>



#ifdef CONFIG_DAMON_KUNIT_TEST

#undef DAMON_MIN_REGION

#define DAMON_MIN_REGION 1

#endif



static DEFINE_MUTEX(damon_lock);

static int nr_running_ctxs;

static bool running_exclusive_ctxs;

mm/damon/tests/core-kunit.h

+26 −29
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void damon_test_split_regions_of(struct kunit *test) 
		kunit_skip(test, "region alloc fail");

	}

	damon_add_region(r, t);

	damon_split_regions_of(t, 2, DAMON_MIN_REGION);

	damon_split_regions_of(t, 2, 1);

	KUNIT_EXPECT_LE(test, damon_nr_regions(t), 2u);

	damon_free_target(t);
@@ -292,7 +292,7 @@ static void damon_test_split_regions_of(struct kunit *test) 
		kunit_skip(test, "second region alloc fail");

	}

	damon_add_region(r, t);

	damon_split_regions_of(t, 4, DAMON_MIN_REGION);

	damon_split_regions_of(t, 4, 1);

	KUNIT_EXPECT_LE(test, damon_nr_regions(t), 4u);

	damon_free_target(t);

}
@@ -373,7 +373,7 @@ static void damon_test_set_regions(struct kunit *test) 


	damon_add_region(r1, t);

	damon_add_region(r2, t);

	damon_set_regions(t, &range, 1, DAMON_MIN_REGION);

	damon_set_regions(t, &range, 1, 1);



	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 3);

	damon_for_each_region(r, t) {
@@ -1037,15 +1037,14 @@ static void damos_test_filter_out(struct kunit *test) 
	f = damos_new_filter(DAMOS_FILTER_TYPE_ADDR, true, false);

	if (!f)

		kunit_skip(test, "filter alloc fail");

	f->addr_range = (struct damon_addr_range){

		.start = DAMON_MIN_REGION * 2, .end = DAMON_MIN_REGION * 6};

	f->addr_range = (struct damon_addr_range){.start = 2, .end = 6};



	t = damon_new_target();

	if (!t) {

		damos_destroy_filter(f);

		kunit_skip(test, "target alloc fail");

	}

	r = damon_new_region(DAMON_MIN_REGION * 3, DAMON_MIN_REGION * 5);

	r = damon_new_region(3, 5);

	if (!r) {

		damos_destroy_filter(f);

		damon_free_target(t);
@@ -1054,50 +1053,48 @@ static void damos_test_filter_out(struct kunit *test) 
	damon_add_region(r, t);



	/* region in the range */

	KUNIT_EXPECT_TRUE(test,

			damos_filter_match(NULL, t, r, f, DAMON_MIN_REGION));

	KUNIT_EXPECT_TRUE(test, damos_filter_match(NULL, t, r, f, 1));

	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 1);



	/* region before the range */

	r->ar.start = DAMON_MIN_REGION * 1;

	r->ar.end = DAMON_MIN_REGION * 2;

	r->ar.start = 1;

	r->ar.end = 2;

	KUNIT_EXPECT_FALSE(test,

			damos_filter_match(NULL, t, r, f, DAMON_MIN_REGION));

			damos_filter_match(NULL, t, r, f, 1));

	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 1);



	/* region after the range */

	r->ar.start = DAMON_MIN_REGION * 6;

	r->ar.end = DAMON_MIN_REGION * 8;

	r->ar.start = 6;

	r->ar.end = 8;

	KUNIT_EXPECT_FALSE(test,

			damos_filter_match(NULL, t, r, f, DAMON_MIN_REGION));

			damos_filter_match(NULL, t, r, f, 1));

	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 1);



	/* region started before the range */

	r->ar.start = DAMON_MIN_REGION * 1;

	r->ar.end = DAMON_MIN_REGION * 4;

	KUNIT_EXPECT_FALSE(test,

			damos_filter_match(NULL, t, r, f, DAMON_MIN_REGION));

	r->ar.start = 1;

	r->ar.end = 4;

	KUNIT_EXPECT_FALSE(test, damos_filter_match(NULL, t, r, f, 1));

	/* filter should have split the region */

	KUNIT_EXPECT_EQ(test, r->ar.start, DAMON_MIN_REGION * 1);

	KUNIT_EXPECT_EQ(test, r->ar.end, DAMON_MIN_REGION * 2);

	KUNIT_EXPECT_EQ(test, r->ar.start, 1);

	KUNIT_EXPECT_EQ(test, r->ar.end, 2);

	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 2);

	r2 = damon_next_region(r);

	KUNIT_EXPECT_EQ(test, r2->ar.start, DAMON_MIN_REGION * 2);

	KUNIT_EXPECT_EQ(test, r2->ar.end, DAMON_MIN_REGION * 4);

	KUNIT_EXPECT_EQ(test, r2->ar.start, 2);

	KUNIT_EXPECT_EQ(test, r2->ar.end, 4);

	damon_destroy_region(r2, t);



	/* region started in the range */

	r->ar.start = DAMON_MIN_REGION * 2;

	r->ar.end = DAMON_MIN_REGION * 8;

	r->ar.start = 2;

	r->ar.end = 8;

	KUNIT_EXPECT_TRUE(test,

			damos_filter_match(NULL, t, r, f, DAMON_MIN_REGION));

			damos_filter_match(NULL, t, r, f, 1));

	/* filter should have split the region */

	KUNIT_EXPECT_EQ(test, r->ar.start, DAMON_MIN_REGION * 2);

	KUNIT_EXPECT_EQ(test, r->ar.end, DAMON_MIN_REGION * 6);

	KUNIT_EXPECT_EQ(test, r->ar.start, 2);

	KUNIT_EXPECT_EQ(test, r->ar.end, 6);

	KUNIT_EXPECT_EQ(test, damon_nr_regions(t), 2);

	r2 = damon_next_region(r);

	KUNIT_EXPECT_EQ(test, r2->ar.start, DAMON_MIN_REGION * 6);

	KUNIT_EXPECT_EQ(test, r2->ar.end, DAMON_MIN_REGION * 8);

	KUNIT_EXPECT_EQ(test, r2->ar.start, 6);

	KUNIT_EXPECT_EQ(test, r2->ar.end, 8);

	damon_destroy_region(r2, t);



	damon_free_target(t);