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 16E18C83F1D for ; Sat, 12 Jul 2025 19:50:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D85026B00CD; Sat, 12 Jul 2025 15:50:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0E396B00CE; Sat, 12 Jul 2025 15:50:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD6C76B00CF; Sat, 12 Jul 2025 15:50:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id AA7F36B00CD for ; Sat, 12 Jul 2025 15:50:35 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 74DFE1A01D8 for ; Sat, 12 Jul 2025 19:50:35 +0000 (UTC) X-FDA: 83656654830.12.AC81EED Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf18.hostedemail.com (Postfix) with ESMTP id D300A1C0007 for ; Sat, 12 Jul 2025 19:50:33 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Q8v/haOo"; spf=pass (imf18.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=BtjOxmuShxB2kqS8RTfFEB63/4LTGi4K3Hq/Ea9M1XI=; b=vtD4XKo/aXIn9BDdLYmZYgS6EHfijSbOhsqmsIgo4CFBEZrN28VPrvaj4UA5plA5WVGIKG jc/tkNTjS8cf2iLRDKNAi8Ua+A3QKGShCUpdT2esRVz5RNFtJE8PF+70+wImyVV/hJsvfY jTixQlxonUpPNIepU38Xf8FKzApc9r8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752349833; a=rsa-sha256; cv=none; b=AvUBpdC4zXg4SdfN2ziWf3BZqKS7l3oFyGuZNvShnYm63jobz4FEC2eKuyYO3LJMx/HOKT 1NVFsEpt1MUV5z7HqTpyTvnGZi5bwyVjgj8p2fQGY/S7+sntIDb+gkqQS/nwZu0lXsrH7o 3i/qUbvlahwufxMSln1N9Dl6xk1p7SY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Q8v/haOo"; spf=pass (imf18.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5CC9C60054; Sat, 12 Jul 2025 19:50:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E031AC4CEF1; Sat, 12 Jul 2025 19:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752349833; bh=dnbBIoiWMyEPhOBD2O+z/mHI1a/WsMzxyryGAQlSQsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q8v/haOo/sr/cW7UzHViSG7jG2NDvn3mEJydrAguNE2pADocNYFn9UqCJKcBwyNYc DbW+E8jFph9RJ+xwhaS81tMh6GfFXF55QN6vdbha+7vsoZX+DS5kOoPLaaUozcMFV/ MZSzvKvyYQPgQY7n6P/yF6e92QddeSAtXzkz/nafa/wMYIWiaPHCHixhlF0KUuJskG nLFSRJGHlqd4L5oNz27q0Lm3ZiQjVJbVBas7v4qyvQJhdwmjGelSqcaCqRCvBSJyOd mxK+DZHpBCZ9fBsWXkUbl7PEqAqDNZCDMRSXUFtcu6nkbkf/YOZ7JViK7FQ/MbUZaJ 6tnFruKRpNN9w== 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 11/14] mm/damon/sysfs: remove damon_sysfs_destroy_targets() Date: Sat, 12 Jul 2025 12:50:13 -0700 Message-Id: <20250712195016.151108-12-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-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D300A1C0007 X-Stat-Signature: uwip6biz9sxc8zpo4qpwm686d837dmi3 X-Rspam-User: X-HE-Tag: 1752349833-609465 X-HE-Meta: U2FsdGVkX1+1r/oTX9ZovQe7F4mFl15TvSQOog005G1vGBojil57y6tymaXJat1W17jnFtuIy1ji7go1UITPtJRlMLOBGLmjmY9pvn5sT/txzgmruxwQ3EINzxTiU44p7J337dEVEke9pQF0rM5IvkwtKQgAfAPkWBDA/UmsLHyrbDLUWuNocVIzYBPRQ8zl/D7rA2id2pVoNXUGLKQOXYRuEGMS18HNdAuqPe9cWEco17alBmFXEFrdvB42Xusecq6BF6BMPUnfubunZ6lOnzV0ZCDBIJryfNL0kC/hjv60skypXSV75Osu1iNC1OPeFB+hHzmYiLN5sRlA2BnB3giNWGHgd6/MpRlOgIez8bsqiZj8Iz0a764quq0pwhA+zXKnIPHz3xTUuZKxrSnxBRGZUZrn9Jq1NDi1ViyRwViMhQdQw/X9S18f/y3ccT4a3LZ6GluL6lKyBemLtfJyBybPMjT9T0DScCkCWi8xk9Vg3+H+4CSXJdVGktz5oPgaT1V2dIoZB8dV1tNz29V2Ux6pkGhe4Pk/grVRPe1CE21cMlf+ryrMRv8XTAF2v5Mrz2YISXoMDasGulhim5raoQ6O0TyAJgIR7CDsfwxnmXjcRHgBttLrCEFo4soSLL00po6QMtUcz0wR26PrphKEqdjYS8CJ1NiNsqZ2u4wR1c29Mu4n8zO7MZ1KPkbO7WEEGcCWO8a2zFjVTrdaFiAYWd8UgAIurs4+T3y91Ldy4UDLtQO8IbnX6KD8tcEDn/5BYPUOS0ugRP0PhCfeabFYlzOgjt0UIp2IXVxhuxQCmDD6vknzvmr5LKtZWoSjXZkMJohZKQuQ1HAu7puOHz29pCp0QUnP+XCa1BfqSWRlAKo8Ytol5P8rn6VCid97OZgEn2Lz5Xd2OwkSJxIEIVxd0WnDuf3Nl/grRfVeIIvyCP/dLjzDXiXrloa4YQQZJHf1NI4lgWpJEn0V41ZIdAT 31Qu1pdY xlEtlj8KypO1/y5qKV8Psc/dsA2XLrfnDTloDIoXGjS/yHkTaw2C2GAQJQ9gaN7cO2KRRA7QkU99vn+l5DxHv9iLVOTvuvHAYHKoAo/2zLLKrU2CKE/zEmMwgBQNTRtGxdVkxCesCz9To5lshBsPqyR8c86VAU6/o4PRTmdbIBGQTi6l9KscCA0cU/QvtmPzGvIP6nFhYQbN7lK1ax5g0zrJ23ulIH238FdmkqQ3m7fJ1gc7ththTeIMS+gEty47iUyd9rphqQmpUBRGuh71peWuA9ZkWoCHK7BlXuvQDiyCH3FBB67GgnwZ7eg== 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