mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: prepare for reparenting non-hierarchical stats
has been removed from the -mm tree. Its filename was
mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats.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: Qi Zheng <[email protected]>
Subject: mm: memcontrol: prepare for reparenting non-hierarchical stats
Date: Thu, 5 Mar 2026 19:52:48 +0800
To resolve the dying memcg issue, we need to reparent LRU folios of child memcg to its parent memcg. This could cause problems for non-hierarchical stats.
As Yosry Ahmed pointed out:
In short, if memory is charged to a dying cgroup at the time of reparenting, when the memory gets uncharged the stats updates will occur at the parent. This will update both hierarchical and non-hierarchical stats of the parent, which would corrupt the parent's non-hierarchical stats (because those counters were never incremented when the memory was charged).
Now we have the following two types of non-hierarchical stats, and they are only used in CONFIG_MEMCG_V1:
a. memcg->vmstats->state_local[i]
b. pn->lruvec_stats->state_local[i]
To ensure that these non-hierarchical stats work properly, we need to reparent these non-hierarchical stats after reparenting LRU folios. To this end, this commit makes the following preparations:
1. implement reparent_state_local() to reparent non-hierarchical stats
2. make css_killed_work_fn() to be called in rcu work, and implement get_non_dying_memcg_start() and get_non_dying_memcg_end() to avoid race between mod_memcg_state()/mod_memcg_lruvec_state()
and reparent_state_local()
---
kernel/cgroup/cgroup.c | 9 ++- mm/memcontrol-v1.c | 16 ++++++ mm/memcontrol-v1.h | 7 ++ mm/memcontrol.c | 97 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 4 deletions(-)
kernel/cgroup/cgroup.c renamed from kernel/cgroup/cgroup.c~mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats +5 -4
@@ -6050,8 +6050,9 @@ out_unlock:*/ static void css_killed_work_fn (struct work_struct *work) { -struct cgroup_subsys_state *css = - container_of(work, struct cgroup_subsys_state, destroy_work); +struct cgroup_subsys_state *css; + + css = container_of(to_rcu_work(work), struct cgroup_subsys_state, destroy_rwork);cgroup_lock ();
@@ -6072,8 +6073,8 @@ static void css_killed_ref_fn(struct per container_of(ref, struct cgroup_subsys_state, refcnt);if (atomic_dec_and_test (&css->online_cnt)) { -INIT_WORK (&css->destroy_work, css_killed_work_fn); -queue_work (cgroup_offline_wq, &css->destroy_work); +INIT_RCU_WORK (&css->destroy_rwork, css_killed_work_fn); +queue_rcu_work (cgroup_offline_wq, &css->destroy_rwork); } }
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats +97 -0
121 lines not on this page · raw message
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats +16 -0
@@ -1884,6 +1884,22 @@ static const unsigned int memcg1_events[ PGMAJFAULT, }; +void reparent_memcg1_state_local (struct mem_cgroup *memcg,struct mem_cgroup *parent) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (memcg1_stats); i++) +reparent_memcg_state_local (memcg, parent, memcg1_stats[i]); +} + +void reparent_memcg1_lruvec_state_local (struct mem_cgroup *memcg,struct mem_cgroup *parent) +{ +int i; + +for (i =0 ; i <NR_LRU_LISTS ; i++) +reparent_memcg_lruvec_state_local (memcg, parent, i); +} +void memcg1_stat_format (struct mem_cgroup *memcg,struct seq_buf *s) {unsigned long memory, memsw;
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcontrol-prepare-for-reparenting-non-hierarchical-stats +7 -0
@@ -73,6 +73,13 @@ void memcg1_uncharge_batch(struct mem_cg unsigned long nr_memory, int nid);void memcg1_stat_format (struct mem_cgroup *memcg,struct seq_buf *s); +void reparent_memcg1_state_local (struct mem_cgroup *memcg,struct mem_cgroup *parent); +void reparent_memcg1_lruvec_state_local (struct mem_cgroup *memcg,struct mem_cgroup *parent); + +void reparent_memcg_state_local (struct mem_cgroup *memcg, +struct mem_cgroup *parent,int idx); +void reparent_memcg_lruvec_state_local (struct mem_cgroup *memcg, +struct mem_cgroup *parent,int idx);void memcg1_account_kmem (struct mem_cgroup *memcg,int nr_pages);static inline bool memcg1_tcpmem_active (struct mem_cgroup *memcg)
_
Patches currently in -mm which might be from [email protected] are