From nobody Sun Feb 8 11:43:32 2026 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDA622C08A8 for ; Thu, 25 Dec 2025 23:23:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766705010; cv=none; b=KCByWpoZToz9llVOyUMnFZq5bfVE/93AeXmGCs+rlI07kLWw3Aya367uRVjoUvWHe0Ev6VImKx74Ve0Hzcb4qkJWIiZU472eUleCWaZrPSGEGv3ZkcDCnDd4rMY9uTbhjazoY8ApK+TCCAurhbsaLiiSNcAzX1+n/COopVnA3rY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766705010; c=relaxed/simple; bh=UuruIwdlaQWu4MKY5wBKcA32oRVtj1/hbo/JH66S8RQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G/8VVo0u801obLzuwty0jZzHMxwJvNTqdHrkJCDUH8oaMc4oMxboYftORcC88Pre3QUillO84TRM4hWEcr/a/D4205WiwJOqFuFJx9mtB5avZNiOUIrMUj1k8G0Ud7v4CW2C9JJzIu0IqonfGngryV2CfA42qTf2wlm8cCpb1vk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=oRUyGsqf; arc=none smtp.client-ip=95.215.58.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="oRUyGsqf" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1766705007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ipsZ9pFNe593ot4ifmspllIFtIPZMuP1LeaIWTARIM=; b=oRUyGsqfO8oIu0XGd1vMKX/zDnb+h/rLJ2bnmz5ROXbpXWcqrk1YtqliVCg/prB5bSjhN+ w9UrtORb08uds/G7Wk0VYMylP0zhakfDgUnt4d5VYs3HbRsKCYHo2q/BJCltTzf9lyK251 VobCXnbIvW3KJuSDm0yEZWfPIvuFzRM= From: Shakeel Butt To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , SeongJae Park , Meta kernel team , linux-mm@kvack.org, cgroups@vger.kernel.org, damon@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] memcg: rename mem_cgroup_ino() to mem_cgroup_id() Date: Thu, 25 Dec 2025 15:21:16 -0800 Message-ID: <20251225232116.294540-9-shakeel.butt@linux.dev> In-Reply-To: <20251225232116.294540-1-shakeel.butt@linux.dev> References: <20251225232116.294540-1-shakeel.butt@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Rename mem_cgroup_ino() to mem_cgroup_id() and mem_cgroup_get_from_ino() to mem_cgroup_get_from_id(). These functions now use cgroup IDs (from cgroup_id()) rather than inode numbers, so the names should reflect that. Signed-off-by: Shakeel Butt Reviewed-by: SeongJae Park --- include/linux/memcontrol.h | 8 ++++---- mm/damon/core.c | 2 +- mm/damon/ops-common.c | 2 +- mm/damon/sysfs-schemes.c | 2 +- mm/memcontrol.c | 2 +- mm/shrinker_debug.c | 10 +++++----- mm/vmscan.c | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 3e7d69020b39..5a1161cadb8d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -830,12 +830,12 @@ static inline unsigned short mem_cgroup_private_id(st= ruct mem_cgroup *memcg) } struct mem_cgroup *mem_cgroup_from_private_id(unsigned short id); =20 -static inline u64 mem_cgroup_ino(struct mem_cgroup *memcg) +static inline u64 mem_cgroup_id(struct mem_cgroup *memcg) { return memcg ? cgroup_id(memcg->css.cgroup) : 0; } =20 -struct mem_cgroup *mem_cgroup_get_from_ino(u64 ino); +struct mem_cgroup *mem_cgroup_get_from_id(u64 ino); =20 static inline struct mem_cgroup *mem_cgroup_from_seq(struct seq_file *m) { @@ -1288,12 +1288,12 @@ static inline struct mem_cgroup *mem_cgroup_from_pr= ivate_id(unsigned short id) return NULL; } =20 -static inline u64 mem_cgroup_ino(struct mem_cgroup *memcg) +static inline u64 mem_cgroup_id(struct mem_cgroup *memcg) { return 0; } =20 -static inline struct mem_cgroup *mem_cgroup_get_from_ino(u64 ino) +static inline struct mem_cgroup *mem_cgroup_get_from_id(u64 ino) { return NULL; } diff --git a/mm/damon/core.c b/mm/damon/core.c index 23c44811ff7f..a2513db59aee 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -2065,7 +2065,7 @@ static unsigned long damos_get_node_memcg_used_bp( unsigned long used_pages, numerator; struct sysinfo i; =20 - memcg =3D mem_cgroup_get_from_ino(goal->memcg_id); + memcg =3D mem_cgroup_get_from_id(goal->memcg_id); if (!memcg) { if (goal->metric =3D=3D DAMOS_QUOTA_NODE_MEMCG_USED_BP) return 0; diff --git a/mm/damon/ops-common.c b/mm/damon/ops-common.c index dd81db95f901..a218d9922234 100644 --- a/mm/damon/ops-common.c +++ b/mm/damon/ops-common.c @@ -274,7 +274,7 @@ bool damos_folio_filter_match(struct damos_filter *filt= er, struct folio *folio) if (!memcg) matched =3D false; else - matched =3D filter->memcg_id =3D=3D mem_cgroup_ino(memcg); + matched =3D filter->memcg_id =3D=3D mem_cgroup_id(memcg); rcu_read_unlock(); break; case DAMOS_FILTER_TYPE_YOUNG: diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 79aa917ab3c0..3beb4456aa51 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -2511,7 +2511,7 @@ static int damon_sysfs_memcg_path_to_id(char *memcg_p= ath, u64 *id) if (!mem_cgroup_online(memcg)) continue; if (damon_sysfs_memcg_path_eq(memcg, path, memcg_path)) { - *id =3D mem_cgroup_ino(memcg); + *id =3D mem_cgroup_id(memcg); found =3D true; break; } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ede39dde05df..5b2925a68832 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3615,7 +3615,7 @@ struct mem_cgroup *mem_cgroup_from_private_id(unsigne= d short id) return xa_load(&mem_cgroup_private_ids, id); } =20 -struct mem_cgroup *mem_cgroup_get_from_ino(u64 ino) +struct mem_cgroup *mem_cgroup_get_from_id(u64 ino) { struct cgroup *cgrp; struct cgroup_subsys_state *css; diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index 7ef16a0b2959..affa64437302 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -70,7 +70,7 @@ static int shrinker_debugfs_count_show(struct seq_file *m= , void *v) memcg_aware ? memcg : NULL, count_per_node); if (total) { - seq_printf(m, "%llu", mem_cgroup_ino(memcg)); + seq_printf(m, "%llu", mem_cgroup_id(memcg)); for_each_node(nid) seq_printf(m, " %lu", count_per_node[nid]); seq_putc(m, '\n'); @@ -107,7 +107,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file = *file, { struct shrinker *shrinker =3D file->private_data; unsigned long nr_to_scan =3D 0, read_len; - u64 ino; + u64 id; struct shrink_control sc =3D { .gfp_mask =3D GFP_KERNEL, }; @@ -120,7 +120,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file = *file, return -EFAULT; kbuf[read_len] =3D '\0'; =20 - if (sscanf(kbuf, "%llu %d %lu", &ino, &nid, &nr_to_scan) !=3D 3) + if (sscanf(kbuf, "%llu %d %lu", &id, &nid, &nr_to_scan) !=3D 3) return -EINVAL; =20 if (nid < 0 || nid >=3D nr_node_ids) @@ -130,7 +130,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file = *file, return size; =20 if (shrinker->flags & SHRINKER_MEMCG_AWARE) { - memcg =3D mem_cgroup_get_from_ino(ino); + memcg =3D mem_cgroup_get_from_id(id); if (!memcg) return -ENOENT; =20 @@ -138,7 +138,7 @@ static ssize_t shrinker_debugfs_scan_write(struct file = *file, mem_cgroup_put(memcg); return -ENOENT; } - } else if (ino !=3D 0) { + } else if (id !=3D 0) { return -EINVAL; } =20 diff --git a/mm/vmscan.c b/mm/vmscan.c index d78043c7e4af..9ad2c2f06bfa 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -5426,7 +5426,7 @@ static int lru_gen_seq_show(struct seq_file *m, void = *v) if (memcg) cgroup_path(memcg->css.cgroup, m->private, PATH_MAX); #endif - seq_printf(m, "memcg %llu %s\n", mem_cgroup_ino(memcg), path); + seq_printf(m, "memcg %llu %s\n", mem_cgroup_id(memcg), path); } =20 seq_printf(m, " node %5d\n", nid); @@ -5522,12 +5522,12 @@ static int run_cmd(char cmd, u64 memcg_id, int nid,= unsigned long seq, return -EINVAL; =20 if (!mem_cgroup_disabled()) { - memcg =3D mem_cgroup_get_from_ino(memcg_id); + memcg =3D mem_cgroup_get_from_id(memcg_id); if (!memcg) return -EINVAL; } =20 - if (memcg_id !=3D mem_cgroup_ino(memcg)) + if (memcg_id !=3D mem_cgroup_id(memcg)) goto done; =20 sc->target_mem_cgroup =3D memcg; --=20 2.47.3