From patchwork Thu Mar 6 17:59:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14005068 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 89FA5C282D1 for ; Thu, 6 Mar 2025 17:59:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CE5828000C; Thu, 6 Mar 2025 12:59:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 452A4280003; Thu, 6 Mar 2025 12:59:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CBAE28000C; Thu, 6 Mar 2025 12:59:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 02B28280003 for ; Thu, 6 Mar 2025 12:59:27 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2B7CA1CDE75 for ; Thu, 6 Mar 2025 17:59:28 +0000 (UTC) X-FDA: 83191888416.25.DEE530A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 88FDF18000A for ; Thu, 6 Mar 2025 17:59:26 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t43p2Qrd; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741283966; a=rsa-sha256; cv=none; b=52jECVwI2TcwmnJEL4rRvLaX0XdmshA6O756eBduGJLcRcoQew1fNhOhLT6vdW6SY51uJc u7tuj/H1hYdXpd/jjc88dLPJzvKXdNBY3DTQXgX5fcC8KwZBWUJH8kP2CyJZgF0Ck/0p4t UnarLxTkRDWMVVrYTNFC1hqc91W5zmw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=t43p2Qrd; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1741283966; 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=mrc/aUUJ9kmlFuWkVIUcPXnflnB3kojMS8xZfCfjiUI=; b=IBW3UnGQd03D+3TCmw7DlFxQGzWTfRlWIXhYxz0ldEbQVRyoMk+XcgxmW1YYb8gFgMOdca /dOtOBXP6No91RJDyv4VeLwRW4PEWunalMcg8z/MfvDZ7AS4Su0Zu44x0IpCd0rDCAIRI9 M1e7YDQu/KdMC8/cDb8whpAVq5dnZAQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 088835C5812; Thu, 6 Mar 2025 17:57:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56B46C4CEE9; Thu, 6 Mar 2025 17:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741283965; bh=I/JHvzw57UoJPSQTgW4gksymyJzz98SL8NUvb1KKOF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t43p2Qrd5Bb7hd33jVdLTrPc3yYngQWh01UWIUXiyNaUQsIeXBmLhrndvro9mNHv2 zfYl/VNQsqQJu0YBC9jinTCv46wgeHwLPdii9KyhU2jcPmfRG6y2LcrX2uvE4TEbA5 /oN5lHeLwafXy7EMGqRii5igXdClJvOyse25zjqBjKief9JXj9/AszDV4bcSHwSs34 RYnmA0VahnP38wsXOymiSLn9KTZvrou8KkPEIqHOIi3gfAQJQBMyX9cod5fMyeIedR vdLmClx/gxJoJLGVb0B2OpPlU2i88kWJzEG5BgOglyKaE8EmtibgkEq+DG67WP2bAW rMfnSYuiw1a3w== 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/13] mm/damon: remove damon_callback->after_sampling Date: Thu, 6 Mar 2025 09:59:06 -0800 Message-Id: <20250306175908.66300-12-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 88FDF18000A X-Stat-Signature: ckkmsaze7iap33arh4xmy1h5hrwrn3nq X-Rspam-User: X-HE-Tag: 1741283966-975043 X-HE-Meta: U2FsdGVkX1+VQhE527pYzrFQtkQVVxkuTNEYbI/h8/7Sp38VyqkNf5osXSnR+47BaRQ8MgVe6ctrE/4Qgg+S9rP57KUTg2DgtMCp+7YaaS/Owayt+mEKlPVzqvG925jIIdeE3yC/W9r0ZU33NQqgTfvUTyYCBQ/52IZCx4lmVkqSf3oIsDK0Z1pgJ8HXAq0m7rT3u5WxCm8USi7FTHOnUjiRXIMhgVzgQ4AuyhIa3P21gxHsT7UVvEdBXM19VOioLWGgvGRjTLSU0W07p30NIV1bMEZd7ZbnCADliDZmCXQr+ZaNyDF5/KYtV4Rb6VljFYxu25Q4cactjciIkbu/p0YHBa4OgxFpeI/usFXHE27sVnhvyvSvr00O4g5zCTUi3XQ5c1F8egPmNeA/2gNXi/arOSMA2z7V08lGCc/YVU2BCZo0qxApFO6vTUhMoXuj3WKOnswRQIiNkKs0LIT1JPdcpUqoLsWgVPfoK+V+visIM7Bt2kGkDBjVW1LGeBXmrb7gQHroulC2LnyUHsXfJoDOmj+1mSp3E6n04SH7nBn6Zp4AWJWi8BtaY0E5pmLULFnmyBMxMYSAY6bicVKkHeMLhIUPReW59OQNjGRdBKCuQEx/BEFl3h9gONcZmWVcx2I2USMCtV2io9fDcrf0ItbfBzx8PsgBoueGx903Il6CFItTinRjU+UVlFKHPXjb00jfmgyitZMchkUrDrwnv6eAESa9iq5fqwp3x/FC9DNMhtJ5VVtHbJusf13DYLmSM+bmxgtYG6ztFZIGBUil5XsgohK1Ot5hqyUJfRhWHImD9CMHDHNGbcgjlIDI0/JJeSx4uRP5h08o0abqOzOm+yB2QfYibaCABKCWCziG7iFOmNyWm3QcRzHW7u4QwKlVV8FZ2Dmr/2VOHEQKohS50ES51bLEiSuEAFL05a30IkO/Vki3zOmtAlVYdUqj/E19TCNWF2ctfD15MzMATTA iNjy1J57 +E5/YwjT4NnwROfAyJiPeEISXy/fyh3MK2W35L+4NeRyMd1R6ANeHMcj2buSxTEVnC8CRTiuXPQZyTmbsERKCjvl9srJ4X2qkDPZyqywG/rwYLdJfIpDrCjaWWL+YQN5VyqKm31taoQYHXTKpYXsxpt8p1c3Frn8MFwzB2Tc9Zn+FvG3GhUZfbD3YVLmO1S1M/M7x2qzhxYbSidQ5P4bpMm4DfhoJ2/W/VeTLfpfKv8mlhbr4Dq5v0bThBsaQhDRasVjsjpfYoeqbGaYsB8NvSY28Kw== 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 callback was used by DAMON sysfs interface for reading DAMON internal data. But it is no more being used, and damon_call() can do similar works in a better way. Remove it. Signed-off-by: SeongJae Park --- include/linux/damon.h | 11 ++++------- mm/damon/core.c | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 043de2408c65..5aa277f4c948 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -604,7 +604,6 @@ struct damon_operations { * struct damon_callback - Monitoring events notification callbacks. * * @after_wmarks_check: Called after each schemes' watermarks check. - * @after_sampling: Called after each sampling. * @after_aggregation: Called after each aggregation. * @before_damos_apply: Called before applying DAMOS action. * @before_terminate: Called before terminating the monitoring. @@ -617,17 +616,15 @@ struct damon_operations { * attributes of the monitoring context while it's deactivated due to the * watermarks, this is the good place to do. * - * The monitoring thread calls @after_sampling and @after_aggregation for each - * of the sampling intervals and aggregation intervals, respectively. - * Therefore, users can safely access the monitoring results without additional - * protection. For the reason, users are recommended to use these callback for - * the accesses to the results. + * The monitoring thread calls @after_aggregation for each of the aggregation + * intervals. Therefore, users can safely access the monitoring results + * without additional protection. For the reason, users are recommended to use + * these callback for the accesses to the results. * * If any callback returns non-zero, monitoring stops. */ struct damon_callback { int (*after_wmarks_check)(struct damon_ctx *context); - int (*after_sampling)(struct damon_ctx *context); int (*after_aggregation)(struct damon_ctx *context); int (*before_damos_apply)(struct damon_ctx *context, struct damon_target *target, diff --git a/mm/damon/core.c b/mm/damon/core.c index 8904b3c079e6..726e581904e5 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -2431,9 +2431,6 @@ static int kdamond_fn(void *data) if (ctx->ops.prepare_access_checks) ctx->ops.prepare_access_checks(ctx); - if (ctx->callback.after_sampling && - ctx->callback.after_sampling(ctx)) - break; kdamond_usleep(sample_interval); ctx->passed_sample_intervals++;