archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-15 14:11:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
SeongJae Park 2025-07-12 12:50:12 -07:00 • committed by Andrew Morton
parent 7114bc5e01
commit ff01aba6e4
5 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mm/damon/core.c
View file

@ -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) {

10
mm/damon/sysfs.c
View file

@ -1298,13 +1298,9 @@ 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,
@ -1387,10 +1383,8 @@ 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);
}
}
/*

6
mm/damon/vaddr.c
View file

@ -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,

2
samples/damon/prcl.c
View file

@ -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;

2
samples/damon/wsse.c
View file

@ -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;