mm-memcontrol-factor-out-memcg-kmem-uncharge-sequence.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: factor out memcg kmem uncharge sequence
has been removed from the -mm tree. Its filename was
mm-memcontrol-factor-out-memcg-kmem-uncharge-sequence.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: Guopeng Zhang <[email protected]>
Subject: mm: memcontrol: factor out memcg kmem uncharge sequence
Date: Mon, 13 Jul 2026 17:03:04 +0800
The kmem-uncharge sequence (mod_memcg_state(MEMCG_KMEM) + memcg1_account_kmem + conditional memcg_uncharge) is duplicated verbatim in obj_cgroup_release() and drain_obj_stock_slot(). Factor it into a small memcg_uncharge_kmem() helper. The reference get/put stays at the call sites, as they differ.
No functional change.
---
mm/memcontrol.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-factor-out-memcg-kmem-uncharge-sequence +10 -8
@@ -137,6 +137,14 @@ bool mem_cgroup_kmem_disabled(void)static void memcg_uncharge (struct mem_cgroup *memcg,unsigned int nr_pages); +static void memcg_uncharge_kmem (struct mem_cgroup *memcg,unsigned int nr_pages) +{ +mod_memcg_state (memcg,MEMCG_KMEM , -nr_pages); +memcg1_account_kmem (memcg, -nr_pages); +if (!mem_cgroup_is_root (memcg)) +memcg_uncharge (memcg, nr_pages); +} +static void obj_cgroup_release (struct percpu_ref *ref) { struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt);
@@ -172,10 +180,7 @@ static void obj_cgroup_release(struct pestruct mem_cgroup *memcg; memcg =get_mem_cgroup_from_objcg (objcg); -mod_memcg_state (memcg,MEMCG_KMEM , -nr_pages); -memcg1_account_kmem (memcg, -nr_pages); -if (!mem_cgroup_is_root (memcg)) -memcg_uncharge (memcg, nr_pages); +memcg_uncharge_kmem (memcg, nr_pages);mem_cgroup_put (memcg); }
@@ -3329,10 +3334,7 @@ static void drain_obj_stock_slot(struct memcg =get_mem_cgroup_from_objcg (old); -mod_memcg_state (memcg,MEMCG_KMEM , -nr_pages); -memcg1_account_kmem (memcg, -nr_pages); -if (!mem_cgroup_is_root (memcg)) -memcg_uncharge (memcg, nr_pages); +memcg_uncharge_kmem (memcg, nr_pages);css_put (&memcg->css); }
_
Patches currently in -mm which might be from [email protected] are
mm-memcg-stop-reclaim-when-a-limit-update-is-superseded.patch