memcg-introduce-private-id-api-for-in-kernel-users.patch removed from -mm tree
The quilt patch titled
Subject: memcg: introduce private id API for in-kernel users
has been removed from the -mm tree. Its filename was
memcg-introduce-private-id-api-for-in-kernel-users.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: memcg: introduce private id API for in-kernel users
Date: Thu, 25 Dec 2025 15:21:09 -0800
Patch series "memcg: separate private and public ID namespaces".
The memory cgroup subsystem maintains a private ID infrastructure that is decoupled from the cgroup IDs. This private ID system exists because some kernel objects (like swap entries and shadow entries in the workingset code) can outlive the cgroup they were associated with. The motivation is best described in commit 73f576c04b941 ("mm:
memcontrol: fix cgroup creation failure after many small jobs").
Unfortunately, some in-kernel users (DAMON, LRU gen debugfs interface, shrinker debugfs) started exposing these private IDs to userspace. This is problematic because:
1. The private IDs are internal implementation details that could change
2. Userspace already has access to cgroup IDs through the cgroup filesystem
3. Using different ID namespaces in different interfaces is confusing
This series cleans up the memcg ID infrastructure by:
1. Explicitly marking the private ID APIs with "private" in their names to make it clear they are for internal use only (swap/workingset)
2. Making the public cgroup ID APIs (mem_cgroup_id/mem_cgroup_get_from_id) unconditionally available
3. Converting DAMON, LRU gen, and shrinker debugfs interfaces to use the public cgroup IDs instead of the private IDs
4. Removing the now-unused wrapper functions and renaming the public APIs for clarity
After this series:
- mem_cgroup_private_id() / mem_cgroup_from_private_id() are used for internal kernel objects that outlive their cgroup (swap, workingset)
- mem_cgroup_id() / mem_cgroup_get_from_id() return the public cgroup ID (from cgroup_id()) for use in userspace-facing interfaces
This patch (of 8):
The memory cgroup maintains a private ID infrastructure decoupled from the cgroup IDs for swapout records and shadow entries. The main motivation of this private ID infra is best described in the commit 73f576c04b941 ("mm:
memcontrol: fix cgroup creation failure after many small jobs").
Unfortunately some users have started exposing these private IDs to the userspace where they should have used the cgroup IDs which are already exposed to the userspace. Let's rename the memcg ID APIs to explicitly mark them private.
No functional change is intended.
---
include/linux/memcontrol.h | 24 +++++++++++++-- mm/list_lru.c | 2 - mm/memcontrol-v1.c | 6 +-- mm/memcontrol-v1.h | 4 +- mm/memcontrol.c | 55 +++++++++++++++++++---------------- mm/workingset.c | 8 ++--- 6 files changed, 61 insertions(+), 38 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-introduce-private-id-api-for-in-kernel-users +21 -3
@@ -65,7 +65,7 @@ struct mem_cgroup_reclaim_cookie {#define MEM_CGROUP_ID_SHIFT 16 -struct mem_cgroup_id { +struct mem_cgroup_private_id {int id;refcount_t ref; };
@@ -191,7 +191,7 @@ struct mem_cgroup {struct cgroup_subsys_state css;/* Private memcg ID. Used to ID objects that outlive the cgroup */ -struct mem_cgroup_id id; +struct mem_cgroup_private_id id;/* Accounted resources */ struct page_counter memory;/* Both v1 & v2 */
@@ -821,13 +821,19 @@ void mem_cgroup_iter_break(struct mem_cgvoid mem_cgroup_scan_tasks (struct mem_cgroup *memcg,int (*)(struct task_struct *,void *),void *arg); -static inline unsigned short mem_cgroup_id (struct mem_cgroup *memcg) +static inline unsigned short mem_cgroup_private_id (struct mem_cgroup *memcg) {if (mem_cgroup_disabled ())return 0 ;return memcg->id.id; } +struct mem_cgroup *mem_cgroup_from_private_id (unsigned short id); + +static inline unsigned short mem_cgroup_id (struct mem_cgroup *memcg) +{ +return mem_cgroup_private_id (memcg); +}struct mem_cgroup *mem_cgroup_from_id (unsigned short id);#ifdef CONFIG_SHRINKER_DEBUG
@@ -1287,6 +1293,18 @@ static inline struct mem_cgroup *mem_cgr {WARN_ON_ONCE (id);/* XXX: This should always return root_mem_cgroup */ +return NULL ; +} + +static inline unsigned short mem_cgroup_private_id (struct mem_cgroup *memcg) +{ +return 0 ; +} + +static inline struct mem_cgroup *mem_cgroup_from_private_id (unsigned short id) +{ +WARN_ON_ONCE (id); +/* XXX: This should always return root_mem_cgroup */ return NULL ; }
mm/list_lru.c renamed from mm/list_lru.c~memcg-introduce-private-id-api-for-in-kernel-users +1 -1
@@ -369,7 +369,7 @@ unsigned long list_lru_walk_node(structxa_for_each (&lru->xa, index, mlru) {rcu_read_lock (); - memcg =mem_cgroup_from_id (index); + memcg =mem_cgroup_from_private_id (index);if (!mem_cgroup_tryget (memcg)) {rcu_read_unlock ();continue ;
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-introduce-private-id-api-for-in-kernel-users +30 -25
167 lines not on this page · raw message
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-introduce-private-id-api-for-in-kernel-users +3 -3
@@ -635,14 +635,14 @@ void memcg1_swapout(struct folio *folio,* have an ID allocated to it anymore, charge the closest online * ancestor for the swap instead and transfer the memory+swap charge. */ - swap_memcg =mem_cgroup_id_get_online (memcg); + swap_memcg =mem_cgroup_private_id_get_online (memcg); nr_entries =folio_nr_pages (folio);/* Get references for the tail pages, too */ if (nr_entries >1 ) -mem_cgroup_id_get_many (swap_memcg, nr_entries -1 ); +mem_cgroup_private_id_get_many (swap_memcg, nr_entries -1 );mod_memcg_state (swap_memcg,MEMCG_SWAP , nr_entries); -swap_cgroup_record (folio,mem_cgroup_id (swap_memcg), entry); +swap_cgroup_record (folio,mem_cgroup_private_id (swap_memcg), entry);folio_unqueue_deferred_split (folio); folio->memcg_data =0 ;
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-introduce-private-id-api-for-in-kernel-users +2 -2
@@ -28,8 +28,8 @@ unsigned long memcg_events(struct mem_cgunsigned long memcg_page_state_output (struct mem_cgroup *memcg,int item);int memory_stat_show (struct seq_file *m,void *v); -void mem_cgroup_id_get_many (struct mem_cgroup *memcg,unsigned int n); -struct mem_cgroup *mem_cgroup_id_get_online (struct mem_cgroup *memcg); +void mem_cgroup_private_id_get_many (struct mem_cgroup *memcg,unsigned int n); +struct mem_cgroup *mem_cgroup_private_id_get_online (struct mem_cgroup *memcg);/* Cgroup v1-specific declarations */ #ifdef CONFIG_MEMCG_V1
mm/workingset.c renamed from mm/workingset.c~memcg-introduce-private-id-api-for-in-kernel-users +4 -4
@@ -254,7 +254,7 @@ static void *lru_gen_eviction(struct fol hist =lru_hist_from_seq (min_seq);atomic_long_add (delta, &lrugen->evicted[hist][type][tier]); -return pack_shadow (mem_cgroup_id (memcg), pgdat, token, workingset); +return pack_shadow (mem_cgroup_private_id (memcg), pgdat, token, workingset); }/*
@@ -271,7 +271,7 @@ static bool lru_gen_test_recent(void *shunpack_shadow (shadow, &memcg_id, &pgdat, token, workingset); - memcg =mem_cgroup_from_id (memcg_id); + memcg =mem_cgroup_from_private_id (memcg_id); *lruvec =mem_cgroup_lruvec (memcg, pgdat); max_seq =READ_ONCE ((*lruvec)->lrugen.max_seq);
@@ -395,7 +395,7 @@ void *workingset_eviction(struct folio * lruvec =mem_cgroup_lruvec (target_memcg, pgdat);/* XXX: target_memcg can be NULL, go through lruvec */ - memcgid =mem_cgroup_id (lruvec_memcg (lruvec)); + memcgid =mem_cgroup_private_id (lruvec_memcg (lruvec)); eviction =atomic_long_read (&lruvec->nonresident_age); eviction >>= bucket_order;workingset_age_nonresident (lruvec,folio_nr_pages (folio));
@@ -456,7 +456,7 @@ bool workingset_test_recent(void *shadow* would be better if the root_mem_cgroup existed in all * configurations instead. */ - eviction_memcg =mem_cgroup_from_id (memcgid); + eviction_memcg =mem_cgroup_from_private_id (memcgid);if (!mem_cgroup_tryget (eviction_memcg)) eviction_memcg =NULL ;rcu_read_unlock ();
_
Patches currently in -mm which might be from [email protected] are