Skip to contentSkip to conversation

mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 31

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/damon: rename min_sz_region of damon_ctx to min_region_sz
has been removed from the -mm tree. Its filename was
mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: mm/damon: rename min_sz_region of damon_ctx to min_region_sz
Date: Sat, 17 Jan 2026 09:52:55 -0800

'min_sz_region' field of 'struct damon_ctx' represents the minimum size of each DAMON region for the context. 'struct damos_access_pattern' has a field of the same name. It confuses readers and makes 'grep' less optimal for them. Rename it to 'min_region_sz'.

Link https://lkml.kernel.org/r/[email protected] open here
Signed-off-by SeongJae Park <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 include/linux/damon.h |    8 ++--
 mm/damon/core.c       |   69 ++++++++++++++++++++--------------------
 mm/damon/lru_sort.c   |    4 +-
 mm/damon/reclaim.c    |    4 +-
 mm/damon/stat.c       |    2 -
 mm/damon/sysfs.c      |    9 ++---
 6 files changed, 49 insertions(+), 47 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +4 -4
@@ -773,7 +773,7 @@ struct damon_attrs {
  *
  * @ops:	Set of monitoring operations for given use cases.
  * @addr_unit:	Scale factor for core to ops address conversion.
- * @min_sz_region:		Minimum region size.
+ * @min_region_sz:	Minimum region size.
  * @adaptive_targets:	Head of monitoring targets (&damon_target) list.
  * @schemes:		Head of schemes (&damos) list.
  */

@@ -818,7 +818,7 @@ struct damon_ctx {
 /* public: */
 	struct damon_operations ops;
 	unsigned long addr_unit;
-	unsigned long min_sz_region;
+	unsigned long min_region_sz;
 
 	struct list_head adaptive_targets;
 	struct list_head schemes;

@@ -907,7 +907,7 @@ static inline void damon_insert_region(s
 void damon_add_region(struct damon_region *r, struct damon_target *t);
 void damon_destroy_region(struct damon_region *r, struct damon_target *t);
 int damon_set_regions(struct damon_target *t, struct damon_addr_range *ranges,
-		unsigned int nr_ranges, unsigned long min_sz_region);
+		unsigned int nr_ranges, unsigned long min_region_sz);
 void damon_update_region_access_rate(struct damon_region *r, bool accessed,
 		struct damon_attrs *attrs);
 

@@ -975,7 +975,7 @@ int damos_walk(struct damon_ctx *ctx, st
 
 int damon_set_region_biggest_system_ram_default(struct damon_target *t,
 				unsigned long *start, unsigned long *end,
-				unsigned long min_sz_region);
+				unsigned long min_region_sz);
 
 #endif	/* CONFIG_DAMON */
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +35 -34

235 lines not on this page · raw message

mm/damon/lru_sort.c renamed from mm/damon/lru_sort.c~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +2 -2
@@ -298,7 +298,7 @@ static int damon_lru_sort_apply_paramete
 	if (!monitor_region_start && !monitor_region_end)
 		addr_unit = 1;
 	param_ctx->addr_unit = addr_unit;
-	param_ctx->min_sz_region = max(DAMON_MIN_REGION_SZ / addr_unit, 1);
+	param_ctx->min_region_sz = max(DAMON_MIN_REGION_SZ / addr_unit, 1);
 
 	if (!damon_lru_sort_mon_attrs.sample_interval) {
 		err = -EINVAL;

@@ -345,7 +345,7 @@ static int damon_lru_sort_apply_paramete
 	err = damon_set_region_biggest_system_ram_default(param_target,
 					&monitor_region_start,
 					&monitor_region_end,
-					param_ctx->min_sz_region);
+					param_ctx->min_region_sz);
 	if (err)
 		goto out;
 	err = damon_commit_ctx(ctx, param_ctx);
mm/damon/reclaim.c renamed from mm/damon/reclaim.c~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +2 -2
@@ -208,7 +208,7 @@ static int damon_reclaim_apply_parameter
 	if (!monitor_region_start && !monitor_region_end)
 		addr_unit = 1;
 	param_ctx->addr_unit = addr_unit;
-	param_ctx->min_sz_region = max(DAMON_MIN_REGION_SZ / addr_unit, 1);
+	param_ctx->min_region_sz = max(DAMON_MIN_REGION_SZ / addr_unit, 1);
 
 	if (!damon_reclaim_mon_attrs.aggr_interval) {
 		err = -EINVAL;

@@ -251,7 +251,7 @@ static int damon_reclaim_apply_parameter
 	err = damon_set_region_biggest_system_ram_default(param_target,
 					&monitor_region_start,
 					&monitor_region_end,
-					param_ctx->min_sz_region);
+					param_ctx->min_region_sz);
 	if (err)
 		goto out;
 	err = damon_commit_ctx(ctx, param_ctx);
mm/damon/stat.c renamed from mm/damon/stat.c~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +1 -1
@@ -181,7 +181,7 @@ static struct damon_ctx *damon_stat_buil
 		goto free_out;
 	damon_add_target(ctx, target);
 	if (damon_set_region_biggest_system_ram_default(target, &start, &end,
-							ctx->min_sz_region))
+							ctx->min_region_sz))
 		goto free_out;
 	return ctx;
 free_out:
mm/damon/sysfs.c renamed from mm/damon/sysfs.c~mm-damon-rename-min_sz_region-of-damon_ctx-to-min_region_sz +5 -4
@@ -1365,7 +1365,7 @@ static int damon_sysfs_set_attrs(struct
 
 static int damon_sysfs_set_regions(struct damon_target *t,
 		struct damon_sysfs_regions *sysfs_regions,
-		unsigned long min_sz_region)
+		unsigned long min_region_sz)
 {
 	struct damon_addr_range *ranges = kmalloc_array(sysfs_regions->nr,
 			sizeof(*ranges), GFP_KERNEL | __GFP_NOWARN);

@@ -1387,7 +1387,7 @@ static int damon_sysfs_set_regions(struc
 		if (ranges[i - 1].end > ranges[i].start)
 			goto out;
 	}
-	err = damon_set_regions(t, ranges, sysfs_regions->nr, min_sz_region);
+	err = damon_set_regions(t, ranges, sysfs_regions->nr, min_region_sz);
 out:
 	kfree(ranges);
 	return err;

@@ -1409,7 +1409,8 @@ static int damon_sysfs_add_target(struct
 			return -EINVAL;
 	}
 	t->obsolete = sys_target->obsolete;
-	return damon_sysfs_set_regions(t, sys_target->regions, ctx->min_sz_region);
+	return damon_sysfs_set_regions(t, sys_target->regions,
+			ctx->min_region_sz);
 }
 
 static int damon_sysfs_add_targets(struct damon_ctx *ctx,

@@ -1469,7 +1470,7 @@ static int damon_sysfs_apply_inputs(stru
 	ctx->addr_unit = sys_ctx->addr_unit;
 	/* addr_unit is respected by only DAMON_OPS_PADDR */
 	if (sys_ctx->ops_id == DAMON_OPS_PADDR)
-		ctx->min_sz_region = max(
+		ctx->min_region_sz = max(
 				DAMON_MIN_REGION_SZ / sys_ctx->addr_unit, 1);
 	err = damon_sysfs_set_attrs(ctx, sys_ctx->attrs);
 	if (err)

_

Patches currently in -mm which might be from [email protected] are