Commit 4ed98243 authored by Kaixu Xia's avatar Kaixu Xia Committed by Andrew Morton
Browse files

mm/damon/core: simplify the parameter passing for region split operation 

The parameter 'struct damon_ctx *ctx' is unnecessary in damon region split
operation, so we can remove it.

Link: https://lkml.kernel.org/r/1660403943-29124-1-git-send-email-kaixuxia@tencent.com


Signed-off-by: default avatarKaixu Xia <kaixuxia@tencent.com>
Reviewed-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 57eb60c0

mm/damon/core-test.h

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void damon_test_split_at(struct kunit *test) 
	t = damon_new_target();

	r = damon_new_region(0, 100);

	damon_add_region(r, t);

	damon_split_region_at(c, t, r, 25);

	damon_split_region_at(t, r, 25);

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

	KUNIT_EXPECT_EQ(test, r->ar.end, 25ul);
@@ -219,14 +219,14 @@ static void damon_test_split_regions_of(struct kunit *test) 
	t = damon_new_target();

	r = damon_new_region(0, 22);

	damon_add_region(r, t);

	damon_split_regions_of(c, t, 2);

	damon_split_regions_of(t, 2);

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

	damon_free_target(t);



	t = damon_new_target();

	r = damon_new_region(0, 220);

	damon_add_region(r, t);

	damon_split_regions_of(c, t, 4);

	damon_split_regions_of(t, 4);

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

	damon_free_target(t);

	damon_destroy_ctx(c);

mm/damon/core.c

+9 −12
Original line number Diff line number Diff line
@@ -658,9 +658,8 @@ static void kdamond_reset_aggregated(struct damon_ctx *c) 
	}

}



static void damon_split_region_at(struct damon_ctx *ctx,

		struct damon_target *t, struct damon_region *r,

		unsigned long sz_r);

static void damon_split_region_at(struct damon_target *t,

				  struct damon_region *r, unsigned long sz_r);



static bool __damos_valid_target(struct damon_region *r, struct damos *s)

{
@@ -726,7 +725,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c, 
						continue;

					sz = DAMON_MIN_REGION;

				}

				damon_split_region_at(c, t, r, sz);

				damon_split_region_at(t, r, sz);

				r = damon_next_region(r);

				sz = r->ar.end - r->ar.start;

			}
@@ -745,7 +744,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c, 
						DAMON_MIN_REGION);

				if (!sz)

					goto update_stat;

				damon_split_region_at(c, t, r, sz);

				damon_split_region_at(t, r, sz);

			}

			ktime_get_coarse_ts64(&begin);

			sz_applied = c->ops.apply_scheme(c, t, r, s);
@@ -928,9 +927,8 @@ static void kdamond_merge_regions(struct damon_ctx *c, unsigned int threshold, 
 * r		the region to be split

 * sz_r		size of the first sub-region that will be made

 */

static void damon_split_region_at(struct damon_ctx *ctx,

		struct damon_target *t, struct damon_region *r,

		unsigned long sz_r)

static void damon_split_region_at(struct damon_target *t,

				  struct damon_region *r, unsigned long sz_r)

{

	struct damon_region *new;
@@ -947,8 +945,7 @@ static void damon_split_region_at(struct damon_ctx *ctx, 
}



/* Split every region in the given target into 'nr_subs' regions */

static void damon_split_regions_of(struct damon_ctx *ctx,

				     struct damon_target *t, int nr_subs)

static void damon_split_regions_of(struct damon_target *t, int nr_subs)

{

	struct damon_region *r, *next;

	unsigned long sz_region, sz_sub = 0;
@@ -969,7 +966,7 @@ static void damon_split_regions_of(struct damon_ctx *ctx, 
			if (sz_sub == 0 || sz_sub >= sz_region)

				continue;



			damon_split_region_at(ctx, t, r, sz_sub);

			damon_split_region_at(t, r, sz_sub);

			sz_region = sz_sub;

		}

	}
@@ -1004,7 +1001,7 @@ static void kdamond_split_regions(struct damon_ctx *ctx) 
		nr_subregions = 3;



	damon_for_each_target(t, ctx)

		damon_split_regions_of(ctx, t, nr_subregions);

		damon_split_regions_of(t, nr_subregions);



	last_nr_regions = nr_regions;

}