mm-memcontrol-allocate-object-cgroup-for-non-kmem-case.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: allocate object cgroup for non-kmem case
has been removed from the -mm tree. Its filename was
mm-memcontrol-allocate-object-cgroup-for-non-kmem-case.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: Muchun Song <[email protected]>
Subject: mm: memcontrol: allocate object cgroup for non-kmem case
Date: Thu, 5 Mar 2026 19:52:24 +0800
To allow LRU page reparenting, the objcg infrastructure is no longer solely applicable to the kmem case. In this patch, we extend the scope of the objcg infrastructure beyond the kmem case, enabling LRU folios to reuse it for folio charging purposes.
It should be noted that LRU folios are not accounted for at the root level, yet the folio->memcg_data points to the root_mem_cgroup. Hence, the folio->memcg_data of LRU folios always points to a valid pointer. However, the root_mem_cgroup does not possess an object cgroup. Therefore, we also allocate an object cgroup for the root_mem_cgroup.
---
mm/memcontrol.c | 51 +++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 27 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-allocate-object-cgroup-for-non-kmem-case +24 -27
@@ -206,10 +206,10 @@ static struct obj_cgroup *obj_cgroup_allreturn objcg; } -static void memcg_reparent_objcgs (struct mem_cgroup *memcg, -struct mem_cgroup *parent) +static void memcg_reparent_objcgs (struct mem_cgroup *memcg) {struct obj_cgroup *objcg, *iter; +struct mem_cgroup *parent =parent_mem_cgroup (memcg); objcg =rcu_replace_pointer (memcg->objcg,NULL , true);
@@ -3386,30 +3386,17 @@ void folio_split_memcg_refs(struct foliocss_get_many (&__folio_memcg (folio)->css, new_refs); } -static int memcg_online_kmem (struct mem_cgroup *memcg) +static void memcg_online_kmem (struct mem_cgroup *memcg) { -struct obj_cgroup *objcg; -if (mem_cgroup_kmem_disabled ()) -return 0 ; +return ;if (unlikely (mem_cgroup_is_root (memcg))) -return 0 ; - - objcg =obj_cgroup_alloc (); -if (!objcg) -return -ENOMEM ; - - objcg->memcg = memcg; -rcu_assign_pointer (memcg->objcg, objcg); -obj_cgroup_get (objcg); - memcg->orig_objcg = objcg; +return ;static_branch_enable (&memcg_kmem_online_key); memcg->kmemcg_id = memcg->id.id; - -return 0 ; }static void memcg_offline_kmem (struct mem_cgroup *memcg)
@@ -3424,12 +3411,6 @@ static void memcg_offline_kmem(struct me parent =parent_mem_cgroup (memcg);memcg_reparent_list_lrus (memcg, parent); - -/* -* Objcg's reparenting must be after list_lru's, make sure list_lru -* helpers won't use parent's list_lru until child is drained. -*/ -memcg_reparent_objcgs (memcg, parent); }#ifdef CONFIG_CGROUP_WRITEBACK
@@ -3930,9 +3911,9 @@ mem_cgroup_css_alloc(struct cgroup_subsystatic int mem_cgroup_css_online (struct cgroup_subsys_state *css) {struct mem_cgroup *memcg =mem_cgroup_from_css (css); +struct obj_cgroup *objcg; -if (memcg_online_kmem (memcg)) - goto remove_id; +memcg_online_kmem (memcg);/* * A memcg must be visible for expand_shrinker_info()
@@ -3942,6 +3923,15 @@ static int mem_cgroup_css_online(structif (alloc_shrinker_info (memcg)) goto offline_kmem; + objcg =obj_cgroup_alloc (); +if (!objcg) + goto free_shrinker; + + objcg->memcg = memcg; +rcu_assign_pointer (memcg->objcg, objcg); +obj_cgroup_get (objcg); + memcg->orig_objcg = objcg; +if (unlikely (mem_cgroup_is_root (memcg)) && !mem_cgroup_disabled ())queue_delayed_work (system_dfl_wq, &stats_flush_dwork,FLUSH_TIME );
@@ -3964,9 +3954,10 @@ static int mem_cgroup_css_online(structxa_store (&mem_cgroup_private_ids, memcg->id.id, memcg,GFP_KERNEL );return 0 ; +free_shrinker: +free_shrinker_info (memcg); offline_kmem:memcg_offline_kmem (memcg); -remove_id:mem_cgroup_private_id_remove (memcg);return -ENOMEM ; }
@@ -3984,6 +3975,12 @@ static void mem_cgroup_css_offline(strucmemcg_offline_kmem (memcg);reparent_deferred_split_queue (memcg); +/* +* The reparenting of objcg must be after the reparenting of the +* list_lru and deferred_split_queue above, which ensures that they will +* not mistakenly get the parent list_lru and deferred_split_queue. +*/ +memcg_reparent_objcgs (memcg);reparent_shrinker_deferred (memcg);wb_memcg_offline (memcg);lru_gen_offline_memcg (memcg);
_
Patches currently in -mm which might be from [email protected] are