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 AB403C83F09 for ; Sun, 6 Jul 2025 20:00:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB9AC6B0406; Sun, 6 Jul 2025 16:00:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C91996B0407; Sun, 6 Jul 2025 16:00:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAA0B6B0408; Sun, 6 Jul 2025 16:00:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A0F066B0406 for ; Sun, 6 Jul 2025 16:00:39 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6858310888C for ; Sun, 6 Jul 2025 20:00:39 +0000 (UTC) X-FDA: 83634907398.19.1D6D53A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id C864020007 for ; Sun, 6 Jul 2025 20:00:37 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fck4arrF; spf=pass (imf13.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1751832037; 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=BtjOxmuShxB2kqS8RTfFEB63/4LTGi4K3Hq/Ea9M1XI=; b=oyZUyBDKk3N7tYQNPTnJkFmR6oXBNyywBEhg/nyeYZu3BMOW2tK+8nLHwf3c28RJ+tR5X7 bj6GQbQ7NKoQAh+CgECP5OiW06Ge0jpnjw/3PGnbTDJCClXmqKgcgN46N3bhz7T+MrnjR8 otUV1zJWl3XjQGA8AwAE48y0XR5oQCE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fck4arrF; spf=pass (imf13.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1751832037; a=rsa-sha256; cv=none; b=vJPWSHdSi9o/LqQ0OarmaeWEBT9t2G/YR3ilrtivypt6J1HyLzWLbO0TzOdtKsJ5JWEJsj iuXwEWeqdT8+uaqtD47FtEbS4yTyq+M+VR5OmfschoapeqB08hgHEP6hf0J9gcRRE28Xb7 HTcooyrXuRrb57oqjbE7mKb8vlLxfYs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 1C1205C57DF; Sun, 6 Jul 2025 20:00:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D54FC4CEF3; Sun, 6 Jul 2025 20:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751832036; bh=dnbBIoiWMyEPhOBD2O+z/mHI1a/WsMzxyryGAQlSQsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fck4arrF4zOiEsMM2KixvP9bY4CrTLZdZmsGgyAw4WFOQ3EuBfiM5q7+fYkRi9jrc 2iSARDSXSgWCcG+Aok1uQ8KZJrFt+y8QVZADce3/aW4+tAw+djptIGH+zqNMhGL02i PtfhySHItgjb30S+G2+AKDAuGxUf6WgGoHzWfKhNRzAzWJFxizsOM+dFQFO2ChtILw Ec/Elo4Vt15QtAqaqI34j8F+LTXxpQCSkTx79mgOL9l8JhoL18bsO0JMiOqxHn3bT7 3emhbaSmmTKkY0GOeANGAU0cnsaX2d0Zf64Icv22zpPs3H90buLXg4F/3b6QOr4Iks BBbhFyVj+JDPg== From: SeongJae Park To: Cc: SeongJae Park , Andrew Morton , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH 11/14] mm/damon/sysfs: remove damon_sysfs_destroy_targets() Date: Sun, 6 Jul 2025 13:00:15 -0700 Message-Id: <20250706200018.42704-12-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250706200018.42704-1-sj@kernel.org> References: <20250706200018.42704-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C864020007 X-Stat-Signature: oi4jjufpt6kdtcjeicy4iepd7jr7aa8j X-Rspam-User: X-HE-Tag: 1751832037-797498 X-HE-Meta: U2FsdGVkX1+N/8WgtEXswJPFFXu8jO4NilPGDDAb8rYCXPhIGvSKLgBCGduuNDERC0AQ+ZMmg+6qmcycWcMTbvRE9kiqqWksPP1zkNx04CeErO7nY4ak7IOmKbUzXaP4IQS6BCeMdbEbhKYFMgDlwPHZHFb5ZdndIbw+L0oO6fKhVNypxQQxR9T7FmPb+ODB8SPP5/aqv5/ymQMcCOuld5YM7j05CHXvYkNjCWdTO1LyoIMvAZIpk6f4NxyppH9RiR6ehht7ZcntYEfcEZbdwPb9E6uAYBJSJ8xsCCxsKez42d32ekN/IKJSKHI4pzB/qqvyU/Y4MYD6YTd3fY/kNk24lt4KWy+xaU8bgLNni/ZK1DVc5cUgQBHztn1/WhtxqsC4eK+d/yyAbLBcuyB5ETnSy29UtxazH3qt2XVNRaylbhLlmVSCapXH6FrmpgbGrHtKzqK9eA4JM5GMx/indmKvlty0P4OzoUw3tdu/RMMQTbeKPL8Lk/aNnBdmd0t7ZeRAj4bbuhoCZlewe/P9S0xtXKHXTa9daGEVtG6xyoVB+p4tk1gAue9GKdhOViLjfiRSlU5seRxtqKgtYpTsZMWVi294zDvBor5hSE9olGJIBh7tQ16A3RSspwqdkSY8L8dF+z74dbKv4JBnPnrDsIvtv1mP2wtxSyVuodbK38aKaQ9oB6Xy9Dqmo9uNkv5SWMcKA11ikiejKRdoFhesTEoxMJFC9fzrcnKiKc66lsV9hO0FxbQBqUK32fB2L12kHdxSTyrTLYidfC+dXiV3fkTXFJSdUnBvGI/UI7KrEAfUwJFs4Sv2iF1/ghGKNWlvEr2BJRMow2louMQ8i/M4d/LthOqUVO2myiaK3MjVJXTFo3PMx5SCnx/lmLZjWQovfpIcsHw/CI2yrDOpDLh6vWeXtD6twbXBqzdJXjStb7V5arvO3O9sqSAM0ojxnDzlKjQcZnAC5f1XTHm4/ri +i8K0Ksa 3dtiujSDRvS4nrUUC2WYjB3yjncFnnTlBLPECQiLF68TkHtiv2gK8jxG61YNR4SmZFygmWjesHFnDq4pQ9i3wq4DVfaYFl8ftpOGMBE8urTpsQDRlNmtIURc8JDc3TFFFgzju22PdkSoxbvTVkAc82/bdZpjdwqJQKDIRhugyPOJLZ9bLo+eVOkuiq6BNS8wNyQSvxZTE3ojW5/H9Cr9WvQFRkorqis7i2B2Rxggra4+ynhwD1Ket4VYmW8F0osv65vQQKfngVPbtmw3Ph03tKbr+Lvuad9h6JkkAuFH+BYyn9uvzE0V2h4bDug== 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: The function was introduced for putting pids and deallocating unnecessary targets. Hence it is called before damon_destroy_ctx(). Now vaddr puts pid for each target destruction (cleanup_target()). damon_destroy_ctx() deallocates the targets anyway. So damon_sysfs_destroy_targets() has no reason to exist. Remove it. Signed-off-by: SeongJae Park --- mm/damon/sysfs.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 5eba6ac53939..b0f7c60d655a 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -1295,14 +1295,6 @@ static int damon_sysfs_set_attrs(struct damon_ctx *ctx, return damon_set_attrs(ctx, &attrs); } -static void damon_sysfs_destroy_targets(struct damon_ctx *ctx) -{ - struct damon_target *t, *next; - - 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) { @@ -1337,7 +1329,6 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, struct damon_ctx *ctx) { struct damon_target *t = damon_new_target(); - int err = -EINVAL; if (!t) return -ENOMEM; @@ -1345,16 +1336,10 @@ static int damon_sysfs_add_target(struct damon_sysfs_target *sys_target, if (damon_target_has_pid(ctx)) { t->pid = find_get_pid(sys_target->pid); if (!t->pid) - goto destroy_targets_out; + /* caller will destroy targets */ + return -EINVAL; } - err = damon_sysfs_set_regions(t, sys_target->regions); - if (err) - goto destroy_targets_out; - return 0; - -destroy_targets_out: - damon_sysfs_destroy_targets(ctx); - return err; + return damon_sysfs_set_regions(t, sys_target->regions); } static int damon_sysfs_add_targets(struct damon_ctx *ctx, @@ -1458,13 +1443,11 @@ static int damon_sysfs_commit_input(void *data) test_ctx = damon_new_ctx(); err = damon_commit_ctx(test_ctx, param_ctx); if (err) { - damon_sysfs_destroy_targets(test_ctx); damon_destroy_ctx(test_ctx); goto out; } err = damon_commit_ctx(kdamond->damon_ctx, param_ctx); out: - damon_sysfs_destroy_targets(param_ctx); damon_destroy_ctx(param_ctx); return err; } -- 2.39.5