Commit cedee98f authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton
Browse files

mm/damon: remove damon_callback->after_sampling 

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.

Link: https://lkml.kernel.org/r/20250306175908.66300-12-sj@kernel.org


Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 07da2185

include/linux/damon.h

+4 −7
Original line number Diff line number Diff line
@@ -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,

mm/damon/core.c

+0 −3
Original line number Diff line number Diff line
@@ -2432,9 +2432,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++;