From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 793E1C83F10 for ; Sat, 12 Jul 2025 19:50:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB08E6B00CC; Sat, 12 Jul 2025 15:50:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5EF66B00CD; Sat, 12 Jul 2025 15:50:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A27426B00CE; Sat, 12 Jul 2025 15:50:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8E14A6B00CC for ; Sat, 12 Jul 2025 15:50:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 64438B7BC8 for ; Sat, 12 Jul 2025 19:50:34 +0000 (UTC) X-FDA: 83656654788.07.87D7D01 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf05.hostedemail.com (Postfix) with ESMTP id 05416100002 for ; Sat, 12 Jul 2025 19:50:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fZjsH8Lu; spf=pass (imf05.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752349833; a=rsa-sha256; cv=none; b=dvtOtrlxfJ72rJRWQjbj4SU4v4JnFq18x1ONIbMo35DfZNw9xY+FUICzGiDyoMncgLAflj jvzlkCLH0eOmwhXA8+W3R95Fbsnoieoh/v0UrueeZtG1mdy+HlSS6JDN7RIOK8ICa9pd4U cQpHKFVAmLP4WZwfKLTto6+HZO7T5Ck= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fZjsH8Lu; spf=pass (imf05.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752349833; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ynBjE6aAI1+QC5Cnjz636nF4OHTlVRSsTwL9K6fx+pA=; b=bLF/ueKPvMywMa1BOOd1Q1BlxGAPHe2kauWQZM3N234VF4vbNUpTc3puAagj/PWfJZR6Vc iNJWluyf/GEaIgKnfeIPMcuVEOH1z11lKXNb0mbU5YmVaB2C2YHn5cl3CmM7Jt4cexoN5i y0iEoLhA5RZZE/H4oKwRhZdb8s6stYI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 4228461127; Sat, 12 Jul 2025 19:50:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7960C4CEEF; Sat, 12 Jul 2025 19:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752349832; bh=fsU2gZbsgWMkSYRpc0h/oL/Vi1gtpWY17PNH7wEfRqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fZjsH8LuWln/avbZ2fC2i7o0sVDMaEqh0lYKe4Uob3y8Q3/oxuTt3XvV20Q0Mkdqb fq5CjUPRamAzYp7UTe2jacxA1AaVazjjdF7uyNAWnL63n+tzWlj78NxwrutMU1I8Q+ /JRoCCwpdeZ8Ekl4sPoK5ORG3Z4JSgHN2Eq8LNa+EzFkj0SUFjJbgx7I5vhM3N0eC7 6amk7B1drrGlPxjjoC9Ehlrs7xtC6StO42TxD3xj/Y++HKpZcdOFub7ZlzKfgzNW4M UBEQiqHNK+1piDXfEls6y6JcMYiD7+CgtLP3uZ+aoNqQibzQn7t1nh/P4sGEnehOhD kplNSl9iKhd9A== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 10/14] mm/damon/vaddr: put pid in cleanup_target() Date: Sat, 12 Jul 2025 12:50:12 -0700 Message-Id: <20250712195016.151108-11-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250712195016.151108-1-sj@kernel.org> References: <20250712195016.151108-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 05416100002 X-Stat-Signature: n8uekqxcfgn7zw4cis6ziu4fnsqzidkp X-HE-Tag: 1752349832-819288 X-HE-Meta: U2FsdGVkX18JGX0e1orUg1PXwwcVdLx7GNZNVS0Z4PMrhHB/7InoW1hZ2DzlzWPK4rlyHK/1tfkMSrsgqrJojwjRxqURNqvQF7qL2uzzy9n90msu4GTXpHNAOaqB/MgkFJcjhou1gl9wYWqS2eHMQeccIUC7HayWI5bmWt+d1oQVSHCAfBKEreYLYLJKopI45UjYkPEhCK6XwWE7jO6VQyh2G1VAfPshlJ65Cvm4IFdygVo7B9cbYotyvavMuJY1nLC32HgdLqHVSKQJX2HhzZjCSeEOPd5frYW3zSZulxzlUsYd0W0asbwcbn/MXyYKX1eFocx+01xBn/TMaTxFFYtzeofKHrP3QwaU275GECJognRS0P20EvkjZMNn81jGg4lRUwDUoDlcmXR6BCwoVzB/o9Pe/LmFqUCQsScdAkQRDdzyDVLeHuxEEAQW7jkiBMNyogY+WcevBU73XBDbHc9abCVglqx+9AQ9PVdA/eviDZSW12+wNGnMSHu6xS9Xm4lGPrLKCSRO7+6+mY7fJaD1sI8ePdjkPZbIfMoLaeBgW0Ua9yrMif9vnNlFqULllxCMShCdDtPzF79WKZoegwj//+mDJLwBkXmSHa0CrgubvdRs1zDQqcFBlwd8UMDNU4wX9tI5EpFdSNgoy4Ps4N9wOjfko6j4smiOyOO74XFMVG+Yd0oPfWqecmueAdiu6DhIgbO8IMsr8cJICCKNjtCvp2OiauSOYM7Z1sQdLHzUfJBewrNwCWh5FbuXDUjfYHw9M3UghqvF5Hh+RaSI9i9jIucF0XbAzLtNqFGirfHmRZCayhbuWIoXrKxYQFJmoRHZUsG9DXu7aVerP4ehi1lW4WxAyG1GQ5PV5WeQrsDO7JR5gCnrBpAqRDvYiEOJlPiaWKKRWgh0B3JeT4iWN6zAQsLqoSSCYubT5mXC8AWaxHi6++t4+q4LIL7j7YOvmz0Pc/a+mVFiTG98SYy cIr/28Fb Hl7b/ufrwOHfMkLkZnBrq46Bb77l/zf6H3QCt X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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. Signed-off-by: SeongJae Park --- mm/damon/core.c | 2 -- mm/damon/sysfs.c | 10 ++-------- mm/damon/vaddr.c | 6 ++++++ samples/damon/prcl.c | 2 -- samples/damon/wsse.c | 2 -- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/mm/damon/core.c b/mm/damon/core.c index 678c9b4e038c..9554743dc992 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -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) { diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index f2f9f756f5a2..5eba6ac53939 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -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); - } } /* diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index 7f5dc9c221a0..94af19c4dfed 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -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, diff --git a/samples/damon/prcl.c b/samples/damon/prcl.c index 25a751a67b2d..1b839c06a612 100644 --- a/samples/damon/prcl.c +++ b/samples/damon/prcl.c @@ -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; diff --git a/samples/damon/wsse.c b/samples/damon/wsse.c index a250e86b24a5..da052023b099 100644 --- a/samples/damon/wsse.c +++ b/samples/damon/wsse.c @@ -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; -- 2.39.5