mm-memcontrol-eliminate-the-problem-of-dying-memory-cgroup-for-lru-folios.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: eliminate the problem of dying memory cgroup for LRU folios
has been removed from the -mm tree. Its filename was
mm-memcontrol-eliminate-the-problem-of-dying-memory-cgroup-for-lru-folios.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: eliminate the problem of dying memory cgroup for LRU folios
Date: Thu, 5 Mar 2026 19:52:50 +0800
Now that everything is set up, switch folio->memcg_data pointers to objcgs, update the accessors, and execute reparenting on cgroup death.
Finally, folio->memcg_data of LRU folios and kmem folios will always point to an object cgroup pointer. The folio->memcg_data of slab folios will point to an vector of object cgroups.
---
include/linux/memcontrol.h | 77 ++++--------- mm/memcontrol-v1.c | 15 +- mm/memcontrol.c | 194 +++++++++++++++++++++-------------- 3 files changed, 151 insertions(+), 135 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcontrol-eliminate-the-problem-of-dying-memory-cgroup-for-lru-folios +25 -52
@@ -369,9 +369,6 @@ enum objext_flags {#define OBJEXTS_FLAGS_MASK (__NR_OBJEXTS_FLAGS - 1)#ifdef CONFIG_MEMCG - -static inline bool folio_memcg_kmem (struct folio *folio); -/* * After the initialization objcg->memcg is always pointing at * a valid memcg, but can be atomically swapped to the parent memcg.
@@ -385,43 +382,19 @@ static inline struct mem_cgroup *obj_cgr }/* -* __folio_memcg - Get the memory cgroup associated with a non-kmem folio -* @folio: Pointer to the folio. -* -* Returns a pointer to the memory cgroup associated with the folio, -* or NULL. This function assumes that the folio is known to have a -* proper memory cgroup pointer. It's not safe to call this function -* against some type of folios, e.g. slab folios or ex-slab folios or -* kmem folios. -*/ -static inline struct mem_cgroup *__folio_memcg (struct folio *folio) -{ -unsigned long memcg_data = folio->memcg_data; - -VM_BUG_ON_FOLIO (folio_test_slab (folio), folio); -VM_BUG_ON_FOLIO (memcg_data &MEMCG_DATA_OBJEXTS , folio); -VM_BUG_ON_FOLIO (memcg_data &MEMCG_DATA_KMEM , folio); - -return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK ); -} - -/* -* __folio_objcg - get the object cgroup associated with a kmem folio. +* folio_objcg - get the object cgroup associated with a folio. * @folio: Pointer to the folio. * * Returns a pointer to the object cgroup associated with the folio, * or NULL. This function assumes that the folio is known to have a -* proper object cgroup pointer. It's not safe to call this function -* against some type of folios, e.g. slab folios or ex-slab folios or -* LRU folios. +* proper object cgroup pointer. */ -static inline struct obj_cgroup *__folio_objcg (struct folio *folio) +static inline struct obj_cgroup *folio_objcg (struct folio *folio) {unsigned long memcg_data = folio->memcg_data;VM_BUG_ON_FOLIO (folio_test_slab (folio), folio);VM_BUG_ON_FOLIO (memcg_data &MEMCG_DATA_OBJEXTS , folio); -VM_BUG_ON_FOLIO (!(memcg_data &MEMCG_DATA_KMEM ), folio);return (struct obj_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK ); }
@@ -435,21 +408,30 @@ static inline struct obj_cgroup *__folio* proper memory cgroup pointer. It's not safe to call this function * against some type of folios, e.g. slab folios or ex-slab folios. * -* For a non-kmem folio any of the following ensures folio and memcg binding -* stability: +* For a folio any of the following ensures folio and objcg binding stability: * * - the folio lock * - LRU isolation * - exclusive reference * -* For a kmem folio a caller should hold an rcu read lock to protect memcg -* associated with a kmem folio from being released. +* Based on the stable binding of folio and objcg, for a folio any of the +* following ensures folio and memcg binding stability: +* +* - cgroup_mutex +* - the lruvec lock +* +* If the caller only want to ensure that the page counters of memcg are +* updated correctly, ensure that the binding stability of folio and objcg +* is sufficient. +* +* Note: The caller should hold an rcu read lock or cgroup_mutex to protect +* memcg associated with a folio from being released. */ static inline struct mem_cgroup *folio_memcg (struct folio *folio) { -if (folio_memcg_kmem (folio)) -return obj_cgroup_memcg (__folio_objcg (folio)); -return __folio_memcg (folio); +struct obj_cgroup *objcg =folio_objcg (folio); + +return objcg ?obj_cgroup_memcg (objcg) :NULL ; }/*
@@ -473,15 +455,10 @@ static inline bool folio_memcg_charged(s* has an associated memory cgroup pointer or an object cgroups vector or * an object cgroup. * -* For a non-kmem folio any of the following ensures folio and memcg binding -* stability: -* -* - the folio lock -* - LRU isolation -* - exclusive reference +* The page and objcg or memcg binding rules can refer to folio_memcg(). * -* For a kmem folio a caller should hold an rcu read lock to protect memcg -* associated with a kmem folio from being released. +* A caller should hold an rcu read lock to protect memcg associated with a +* page from being released. */ static inline struct mem_cgroup *folio_memcg_check (struct folio *folio) {
@@ -490,18 +467,14 @@ static inline struct mem_cgroup *folio_m* for slabs, READ_ONCE() should be used here. */ unsigned long memcg_data =READ_ONCE (folio->memcg_data); +struct obj_cgroup *objcg;if (memcg_data &MEMCG_DATA_OBJEXTS )return NULL ; -if (memcg_data &MEMCG_DATA_KMEM ) { -struct obj_cgroup *objcg; - - objcg = (void *)(memcg_data & ~OBJEXTS_FLAGS_MASK ); -return obj_cgroup_memcg (objcg); - } + objcg = (void *)(memcg_data & ~OBJEXTS_FLAGS_MASK ); -return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK ); +return objcg ?obj_cgroup_memcg (objcg) :NULL ; }static inline struct mem_cgroup *page_memcg_check (struct page *page)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-eliminate-the-problem-of-dying-memory-cgroup-for-lru-folios +117 -77
403 lines not on this page · raw message
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcontrol-eliminate-the-problem-of-dying-memory-cgroup-for-lru-folios +9 -6
@@ -613,6 +613,7 @@ void memcg1_commit_charge(struct folio *void memcg1_swapout (struct folio *folio,swp_entry_t entry) {struct mem_cgroup *memcg, *swap_memcg; +struct obj_cgroup *objcg;unsigned int nr_entries;VM_BUG_ON_FOLIO (folio_test_lru (folio), folio);
@@ -624,12 +625,13 @@ void memcg1_swapout(struct folio *folio,if (!do_memsw_account ())return ; - memcg =folio_memcg (folio); - -VM_WARN_ON_ONCE_FOLIO (!memcg, folio); -if (!memcg) + objcg =folio_objcg (folio); +VM_WARN_ON_ONCE_FOLIO (!objcg, folio); +if (!objcg)return ; +rcu_read_lock (); + memcg =obj_cgroup_memcg (objcg);/* * In case the memcg owning these pages has been offlined and doesn't * have an ID allocated to it anymore, charge the closest online
@@ -644,7 +646,7 @@ void memcg1_swapout(struct folio *folio,folio_unqueue_deferred_split (folio); folio->memcg_data =0 ; -if (!mem_cgroup_is_root (memcg)) +if (!obj_cgroup_is_root (objcg))page_counter_uncharge (&memcg->memory, nr_entries);if (memcg != swap_memcg) {
@@ -665,7 +667,8 @@ void memcg1_swapout(struct folio *folio,preempt_enable_nested ();memcg1_check_events (memcg,folio_nid (folio)); -css_put (&memcg->css); +rcu_read_unlock (); +obj_cgroup_put (objcg); }/*
_
Patches currently in -mm which might be from [email protected] are