Skip to contentSkip to conversation

mm-damon-use-cgroup-id-instead-of-private-memcg-id.patch removed from -mm tree

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

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/damon: use cgroup ID instead of private memcg ID
has been removed from the -mm tree. Its filename was
mm-damon-use-cgroup-id-instead-of-private-memcg-id.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: Shakeel Butt <[email protected]>
Subject: mm/damon: use cgroup ID instead of private memcg ID
Date: Thu, 25 Dec 2025 15:21:13 -0800

DAMON was using the internal private memcg ID which is meant for tracking kernel objects that outlive their cgroup. Switch to using the public cgroup ID instead.

---

 include/linux/damon.h    |    4 ++--
 mm/damon/core.c          |    7 ++-----
 mm/damon/ops-common.c    |    2 +-
 mm/damon/sysfs-schemes.c |    8 ++++----
 4 files changed, 9 insertions(+), 12 deletions(-)
include/linux/damon.h renamed from include/linux/damon.h~mm-damon-use-cgroup-id-instead-of-private-memcg-id +2 -2
@@ -203,7 +203,7 @@ struct damos_quota_goal {
 		u64 last_psi_total;
 		struct {
 			int nid;
-			unsigned short memcg_id;
+			u64 memcg_id;
 		};
 	};
 	struct list_head list;
@@ -419,7 +419,7 @@ struct damos_filter {
 	bool matching;
 	bool allow;
 	union {
-		unsigned short memcg_id;
+		u64 memcg_id;
 		struct damon_addr_range addr_range;
 		int target_idx;
 		struct damon_size_range sz_range;
mm/damon/core.c renamed from mm/damon/core.c~mm-damon-use-cgroup-id-instead-of-private-memcg-id +2 -5
@@ -2094,16 +2094,13 @@ static unsigned long damos_get_node_memc
 	unsigned long used_pages, numerator;
 	struct sysinfo i;
 
-	rcu_read_lock();
-	memcg = mem_cgroup_from_id(goal->memcg_id);
-	if (!memcg || !mem_cgroup_tryget(memcg)) {
-		rcu_read_unlock();
+	memcg = mem_cgroup_get_from_ino(goal->memcg_id);
+	if (!memcg) {
 		if (goal->metric == DAMOS_QUOTA_NODE_MEMCG_USED_BP)
 			return 0;
 		else	/* DAMOS_QUOTA_NODE_MEMCG_FREE_BP */
 			return 10000;
 	}
-	rcu_read_unlock();
 
 	mem_cgroup_flush_stats(memcg);
 	lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(goal->nid));
mm/damon/ops-common.c renamed from mm/damon/ops-common.c~mm-damon-use-cgroup-id-instead-of-private-memcg-id +1 -1
@@ -274,7 +274,7 @@ bool damos_folio_filter_match(struct dam
 		if (!memcg)
 			matched = false;
 		else
-			matched = filter->memcg_id == mem_cgroup_id(memcg);
+			matched = filter->memcg_id == mem_cgroup_ino(memcg);
 		rcu_read_unlock();
 		break;
 	case DAMOS_FILTER_TYPE_YOUNG:
mm/damon/sysfs-schemes.c renamed from mm/damon/sysfs-schemes.c~mm-damon-use-cgroup-id-instead-of-private-memcg-id +4 -4
@@ -2494,7 +2494,7 @@ static bool damon_sysfs_memcg_path_eq(st
 	return false;
 }
 
-static int damon_sysfs_memcg_path_to_id(char *memcg_path, unsigned short *id)
+static int damon_sysfs_memcg_path_to_id(char *memcg_path, u64 *id)
 {
 	struct mem_cgroup *memcg;
 	char *path;
@@ -2509,11 +2509,11 @@ static int damon_sysfs_memcg_path_to_id(
 
 	for (memcg = mem_cgroup_iter(NULL, NULL, NULL); memcg;
 			memcg = mem_cgroup_iter(NULL, memcg, NULL)) {
-		/* skip removed memcg */
-		if (!mem_cgroup_id(memcg))
+		/* skip offlined memcg */
+		if (!mem_cgroup_online(memcg))
 			continue;
 		if (damon_sysfs_memcg_path_eq(memcg, path, memcg_path)) {
-			*id = mem_cgroup_id(memcg);
+			*id = mem_cgroup_ino(memcg);
 			found = true;
 			break;
 		}

_

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