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

mm/damon/vaddr: put pid in cleanup_target() 

Implement cleanup_target() callback for [f]vaddr, which calls put_pid()
for each target that will be destroyed.  Also remove redundant put_pid()
calls in core, sysfs and sample modules, which were required to be done
redundantly due to the lack of such self cleanup in vaddr.

Link: https://lkml.kernel.org/r/20250712195016.151108-11-sj@kernel.org


Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7114bc5e

mm/damon/core.c

+0 −2
Original line number Diff line number Diff line
@@ -1139,8 +1139,6 @@ static int damon_commit_targets( 
		} else {

			struct damos *s;



			if (damon_target_has_pid(dst))

				put_pid(dst_target->pid);

			damon_destroy_target(dst_target, dst);

			damon_for_each_scheme(s, dst) {

				if (s->quota.charge_target_from == dst_target) {

mm/damon/sysfs.c

+2 −8
Original line number Diff line number Diff line
@@ -1298,14 +1298,10 @@ static int damon_sysfs_set_attrs(struct damon_ctx *ctx, 
static void damon_sysfs_destroy_targets(struct damon_ctx *ctx)

{

	struct damon_target *t, *next;

	bool has_pid = damon_target_has_pid(ctx);



	damon_for_each_target_safe(t, next, ctx) {

		if (has_pid)

			put_pid(t->pid);

	damon_for_each_target_safe(t, next, ctx)

		damon_destroy_target(t, ctx);

}

}



static int damon_sysfs_set_regions(struct damon_target *t,

		struct damon_sysfs_regions *sysfs_regions)
@@ -1387,11 +1383,9 @@ static void damon_sysfs_before_terminate(struct damon_ctx *ctx) 
	if (!damon_target_has_pid(ctx))

		return;



	damon_for_each_target_safe(t, next, ctx) {

		put_pid(t->pid);

	damon_for_each_target_safe(t, next, ctx)

		damon_destroy_target(t, ctx);

}

}



/*

 * damon_sysfs_upd_schemes_stats() - Update schemes stats sysfs files.

mm/damon/vaddr.c

+6 −0
Original line number Diff line number Diff line
@@ -805,6 +805,11 @@ static bool damon_va_target_valid(struct damon_target *t) 
	return false;

}



static void damon_va_cleanup_target(struct damon_target *t)

{

	put_pid(t->pid);

}



#ifndef CONFIG_ADVISE_SYSCALLS

static unsigned long damos_madvise(struct damon_target *target,

		struct damon_region *r, int behavior)
@@ -946,6 +951,7 @@ static int __init damon_va_initcall(void) 
		.prepare_access_checks = damon_va_prepare_access_checks,

		.check_accesses = damon_va_check_accesses,

		.target_valid = damon_va_target_valid,

		.cleanup_target = damon_va_cleanup_target,

		.cleanup = NULL,

		.apply_scheme = damon_va_apply_scheme,

		.get_scheme_score = damon_va_scheme_score,

samples/damon/prcl.c

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ static void damon_sample_prcl_stop(void) 
		damon_stop(&ctx, 1);

		damon_destroy_ctx(ctx);

	}

	if (target_pidp)

		put_pid(target_pidp);

}



static bool init_called;

samples/damon/wsse.c

+0 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ static void damon_sample_wsse_stop(void) 
		damon_stop(&ctx, 1);

		damon_destroy_ctx(ctx);

	}

	if (target_pidp)

		put_pid(target_pidp);

}



static bool init_called;