From patchwork Thu Mar 6 17:59:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14005069 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 72A55C28B24 for ; Thu, 6 Mar 2025 17:59:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 727C728000D; Thu, 6 Mar 2025 12:59:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D855280003; Thu, 6 Mar 2025 12:59:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57D8228000D; Thu, 6 Mar 2025 12:59:30 -0500 (EST) 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 37AD2280003 for ; Thu, 6 Mar 2025 12:59:30 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BB6321A233C for ; Thu, 6 Mar 2025 17:59:29 +0000 (UTC) X-FDA: 83191888458.10.B34CAA2 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf27.hostedemail.com (Postfix) with ESMTP id 1EC2C40005 for ; Thu, 6 Mar 2025 17:59:19 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jfv74gGj; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741283960; 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=C1AJWfRumzmQ358us44uziJ6YdgiSOHEvhD97GuZ1Fc=; b=iWCvl0IOYJWqiY3OpWhbqe9LHl5zvy6VVNFMrtZo3ja+VJRQunXUw0R5/UoHkpWGJKzoEE udhhh8KDCw3xoBiOKY+nY7k1CjmP8M93sGmKXb13DtRvsnSIMD0/djSYKlB4icE4XpSk+f 4P4kyixvjJ8Lh7SGBLh0bTDHaKldqbM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741283960; a=rsa-sha256; cv=none; b=KcfbVRZVHVanD05p9gJyYLT6n/30j6BlvjRd+6CqQLe3nxAmDgsBUlM8dvVzMBIr6bevLm H3M2IDFYxV0CFDTlhte6uUVxRng731mpIHxbAn8o1gPDTM1kwVihWS/rjCOH9wP7fEZyxC bsKOIdDPMZjhpxJt5VRzKKUcJHPuWRg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jfv74gGj; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id DBEC0A450D6; Thu, 6 Mar 2025 17:53:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C533C4CEED; Thu, 6 Mar 2025 17:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741283959; bh=T05PHV/b/RY6SE79bGJVruG1lJQyvBwcsDSu/WYUE0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jfv74gGjwJwOzARB71Z3kiafD2XrxR+FBGWh46b6W92enZzckMZ/RfqhldIzQyAsB EuyTB/WjbejaSlS+HpfG19pNGGEQWSU+erqB7cOPWDpxsPgWkVm+2KiKVKBvA5i+JP dEUw92P7TFRXUR88EmfDcqc1VfLEqqY/CJ/KCYqdAv1ZOE6e/6BQG/dEIRFOgVWwBw CiDj/v3AhV17AbIbDobtTPKMJmeIUnuDjIqdvjV2bNWcd2dfagZz8B1XA18spApTEq onjO1JALR0bjADcA8Cb08a0ywegLPi9sm1gbyWQ6Q/C9FWPsbrbXBLxb6RzMUpnfVz cxAObq6TqHqZA== 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 06/13] mm/damon/sysfs: remove damon_sysfs_cmd_request_callback() and its callers Date: Thu, 6 Mar 2025 09:59:01 -0800 Message-Id: <20250306175908.66300-7-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250306175908.66300-1-sj@kernel.org> References: <20250306175908.66300-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1EC2C40005 X-Stat-Signature: 6gfznx9h6ji4awywhbw1k3t48q41jyw5 X-HE-Tag: 1741283959-387782 X-HE-Meta: U2FsdGVkX1+882G3KTAvlLvud7/A3/Tyv+unLRjSmF91bEJv9xYlZiKJKLAsFfyve2JQLTP93udtikxpb1ymbF2aTs48FMltSGe7zKbg3yHbp/MTEtYi7/Jto4iMdwX1lNiGiI9yVbYoJih1RaxHTnECp2PWz+hvYBUr6DiLEQYFWJg+dUxiEMotxlxYOwXJGVMkMLcqRiRZSgo37yUy9ojZdMq3Yv5laBGNOrrsY/gK8LKA12tlCj45qyDdFC7iNmzNaBuwL5lZ9MLbQ9zAvpcLxB7POHcd1EqGs5bXSKITJFALMNWF+cVEIhPgFi5+nWd8epEszXhiFvFo9J38A+IsTCfxICyalnHm+3r5tgzf0gPAgfUqM5QH+yveWudIIW09kJrqTTQJ8y98/6Fa8MCTZUGdVODlwul9EwaQl6Xjp1tJvMae0lGeiS0mMs8AMZW4Gg47eovgJ3BbaOjoUtsLX8TCUHjLFuRTJEu0Yk2ITwofAlrTmY3zqw1TUUQ+SERl81PSz9+17nrkQbTJUUuAk7MiAfdtbfix6Ih8i/OqjJ02ucoocuei/NzOa54pYkBooHVAgUo7ED9DBV8ArA/JQua5Hgn42oHUCD5kxewACDkrv3VccbTNGPD11Pvzy7gOQBxOCzb+SznhqogRftV9E1snc9CY/zwMJKtzgREwJP26qxGcxvNsqMUkfiQFdApmgrlgBRBA6SKqd8sRR91RUlpfk1YANAlZka8GmJ3f97yrkNsr8/geKCDs+xs8f5ymB3H4bzYg1QGQm63QfMe4bmXULUh2AYkPd1UIRI9tSMAXpPnpbcZrjVDS0Hwa9toT36XBiW5YPFs1+4G4SZrznIt+R0/N2m5LfAICBezbzyskGgA9+cCEsVcLcZZGGJkUjgbMdif3gy5ytd4mL+xlZHspa4hS7a+hhQ4AkIg0IkpoquH2iD9rzHv90jZz2XSErpEFzjvac1KD7nL 61ETlSA+ S4/q7zOxSlHw+7qnjSX3SsWFv916WO1dRLWf/cR5Deh2M/sHVq8g/hp/3BwTfO4ujetH7X8LU0raI8T5iwTW4Wtbr/naLxjs/ioHHJ5qzAsQyDwV/rc20Svp8E0jwCnbfHHMC4vjTpHhcacXt5YE1Yosbn3AlCUbzbKPi9Gh6pgL1goYTvjn0qnUeMaPen840aHx/ED3I0NZthdUmN7mQmq3rX/U1M7Ahz2sp9+rKFIEUjHqNciopzDV2jGMgukbHgmnBMW00IzCTReiMzpPtGuNEXA== 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: damon_sysfs_cmd_request_callback() is the damon_callback hook functions that were used to handle user requests that need to read and/or write DAMON internal data. All the usages are now updated to use damon_call() or damos_walk(), though. Remove it and its callers. Signed-off-by: SeongJae Park --- mm/damon/sysfs.c | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 166161f12c26..e5bcf019086f 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -1529,65 +1529,6 @@ static int damon_sysfs_upd_tuned_intervals(void *data) return 0; } -/* - * damon_sysfs_cmd_request_callback() - DAMON callback for handling requests. - * @c: The DAMON context of the callback. - * @active: Whether @c is not deactivated due to watermarks. - * @after_aggr: Whether this is called from after_aggregation() callback. - * - * This function is periodically called back from the kdamond thread for @c. - * Then, it checks if there is a waiting DAMON sysfs request and handles it. - */ -static int damon_sysfs_cmd_request_callback(struct damon_ctx *c, bool active, - bool after_aggregation) -{ - struct damon_sysfs_kdamond *kdamond; - int err = 0; - - /* avoid deadlock due to concurrent state_store('off') */ - if (!mutex_trylock(&damon_sysfs_lock)) - return 0; - kdamond = damon_sysfs_cmd_request.kdamond; - if (!kdamond || kdamond->damon_ctx != c) - goto out; - switch (damon_sysfs_cmd_request.cmd) { - default: - break; - } - /* Mark the request as invalid now. */ - damon_sysfs_cmd_request.kdamond = NULL; -out: - mutex_unlock(&damon_sysfs_lock); - return err; -} - -static int damon_sysfs_after_wmarks_check(struct damon_ctx *c) -{ - /* - * after_wmarks_check() is called back while the context is deactivated - * by watermarks. - */ - return damon_sysfs_cmd_request_callback(c, false, false); -} - -static int damon_sysfs_after_sampling(struct damon_ctx *c) -{ - /* - * after_sampling() is called back only while the context is not - * deactivated by watermarks. - */ - return damon_sysfs_cmd_request_callback(c, true, false); -} - -static int damon_sysfs_after_aggregation(struct damon_ctx *c) -{ - /* - * after_aggregation() is called back only while the context is not - * deactivated by watermarks. - */ - return damon_sysfs_cmd_request_callback(c, true, true); -} - static struct damon_ctx *damon_sysfs_build_ctx( struct damon_sysfs_context *sys_ctx) { @@ -1603,9 +1544,6 @@ static struct damon_ctx *damon_sysfs_build_ctx( return ERR_PTR(err); } - ctx->callback.after_wmarks_check = damon_sysfs_after_wmarks_check; - ctx->callback.after_sampling = damon_sysfs_after_sampling; - ctx->callback.after_aggregation = damon_sysfs_after_aggregation; ctx->callback.before_terminate = damon_sysfs_before_terminate; return ctx; }