mm-memcontrol-return-root-object-cgroup-for-root-memory-cgroup.patch removed from -mm tree
The quilt patch titled
Subject: mm: memcontrol: return root object cgroup for root memory cgroup
has been removed from the -mm tree. Its filename was
mm-memcontrol-return-root-object-cgroup-for-root-memory-cgroup.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: return root object cgroup for root memory cgroup
Date: Thu, 5 Mar 2026 19:52:25 +0800
Memory cgroup functions such as get_mem_cgroup_from_folio() and get_mem_cgroup_from_mm() return a valid memory cgroup pointer, even for the root memory cgroup. In contrast, the situation for object cgroups has been different.
Previously, the root object cgroup couldn't be returned because it didn't exist. Now that a valid root object cgroup exists, for the sake of consistency, it's necessary to align the behavior of object-cgroup-related operations with that of memory cgroup APIs.
---
include/linux/memcontrol.h | 26 +++++++++++++++----- mm/memcontrol.c | 45 ++++++++++++++++++----------------- mm/percpu.c | 2 - 3 files changed, 45 insertions(+), 28 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcontrol-return-root-object-cgroup-for-root-memory-cgroup +20 -6
@@ -332,6 +332,7 @@ struct mem_cgroup {#define MEMCG_CHARGE_BATCH 64Uextern struct mem_cgroup *root_mem_cgroup; +extern struct obj_cgroup *root_obj_cgroup;enum page_memcg_data_flags {/* page->memcg_data is a pointer to an slabobj_ext vector */
@@ -548,6 +549,11 @@ static inline bool mem_cgroup_is_root(streturn (memcg == root_mem_cgroup); } +static inline bool obj_cgroup_is_root (const struct obj_cgroup *objcg) +{ +return objcg == root_obj_cgroup; +} +static inline bool mem_cgroup_disabled (void ) {return !cgroup_subsys_enabled (memory_cgrp_subsys);
@@ -774,23 +780,26 @@ struct mem_cgroup *mem_cgroup_from_css(sstatic inline bool obj_cgroup_tryget (struct obj_cgroup *objcg) { +if (obj_cgroup_is_root (objcg)) +return true;return percpu_ref_tryget (&objcg->refcnt); } -static inline void obj_cgroup_get (struct obj_cgroup *objcg) +static inline void obj_cgroup_get_many (struct obj_cgroup *objcg, +unsigned long nr) { -percpu_ref_get (&objcg->refcnt); +if (!obj_cgroup_is_root (objcg)) +percpu_ref_get_many (&objcg->refcnt, nr); } -static inline void obj_cgroup_get_many (struct obj_cgroup *objcg, -unsigned long nr) +static inline void obj_cgroup_get (struct obj_cgroup *objcg) { -percpu_ref_get_many (&objcg->refcnt, nr); +obj_cgroup_get_many (objcg,1 ); }static inline void obj_cgroup_put (struct obj_cgroup *objcg) { -if (objcg) +if (objcg && !obj_cgroup_is_root (objcg))percpu_ref_put (&objcg->refcnt); }
@@ -1086,6 +1095,11 @@ static inline bool mem_cgroup_is_root(st {return true; } + +static inline bool obj_cgroup_is_root (const struct obj_cgroup *objcg) +{ +return true; +}static inline bool mem_cgroup_disabled (void ) {
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcontrol-return-root-object-cgroup-for-root-memory-cgroup +24 -21
119 lines not on this page · raw message
mm/percpu.c renamed from mm/percpu.c~mm-memcontrol-return-root-object-cgroup-for-root-memory-cgroup +1 -1
@@ -1622,7 +1622,7 @@ static bool pcpu_memcg_pre_alloc_hook(sireturn true; objcg =current_obj_cgroup (); -if (!objcg) +if (!objcg ||obj_cgroup_is_root (objcg))return true;if (obj_cgroup_charge (objcg, gfp,pcpu_obj_full_size (size)))
_
Patches currently in -mm which might be from [email protected] are