mm-memcontrol-prevent-memory-cgroup-release-in-mem_cgroup_swap_full.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: prevent memory cgroup release in mem_cgroup_swap_full()
has been removed from the -mm tree. Its filename was
mm-memcontrol-prevent-memory-cgroup-release-in-mem_cgroup_swap_full.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: prevent memory cgroup release in mem_cgroup_swap_full()
Date: Thu, 5 Mar 2026 19:52:33 +0800
In the near future, a folio will no longer pin its corresponding memory cgroup. To ensure safety, it will only be appropriate to hold the rcu read lock or acquire a reference to the memory cgroup returned by folio_memcg(), thereby preventing it from being released.
In the current patch, the rcu read lock is employed to safeguard against the release of the memory cgroup in mem_cgroup_swap_full().
This serves as a preparatory measure for the reparenting of the LRU pages.
---
mm/memcontrol.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-prevent-memory-cgroup-release-in-mem_cgroup_swap_full +10 -8
@@ -5338,27 +5338,29 @@ long mem_cgroup_get_nr_swap_pages(structbool mem_cgroup_swap_full (struct folio *folio) {struct mem_cgroup *memcg; +bool ret = false;VM_BUG_ON_FOLIO (!folio_test_locked (folio), folio);if (vm_swap_full ())return true; -if (do_memsw_account ()) -return false; +if (do_memsw_account () || !folio_memcg_charged (folio)) +return ret; +rcu_read_lock (); memcg =folio_memcg (folio); -if (!memcg) -return false; -for (; !mem_cgroup_is_root (memcg); memcg =parent_mem_cgroup (memcg)) {unsigned long usage =page_counter_read (&memcg->swap);if (usage *2 >=READ_ONCE (memcg->swap.high) || - usage *2 >=READ_ONCE (memcg->swap.max)) -return true; + usage *2 >=READ_ONCE (memcg->swap.max)) { + ret = true; +break ; + } } +rcu_read_unlock (); -return false; +return ret; }static int __init setup_swap_account (char *s)
_
Patches currently in -mm which might be from [email protected] are