memcg-replace-memcg-id-idr-with-xarray.patch removed from -mm tree
The quilt patch titled
Subject: memcg: replace memcg ID idr with xarray
has been removed from the -mm tree. Its filename was
memcg-replace-memcg-id-idr-with-xarray.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: Shakeel Butt <[email protected]>
Subject: memcg: replace memcg ID idr with xarray
Date: Fri, 9 Aug 2024 10:26:18 -0700
At the moment memcg IDs are managed through IDR which requires external synchronization mechanisms and makes the allocation code a bit awkward. Let's switch to xarray and make the code simpler.
[[email protected]: fix error path in mem_cgroup_alloc(), per Dan]
Signed-off-by Shakeel Butt <[email protected]>
Suggested-by Matthew Wilcox <[email protected]>
Reviewed-by Roman Gushchin <[email protected]>
Reviewed-by Matthew Wilcox (Oracle) <[email protected]>
Acked-by Johannes Weiner <[email protected]>
Reviewed-by Muchun Song <[email protected]>
Acked-by Michal Hocko <[email protected]>
Cc Dan Carpenter <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-replace-memcg-id-idr-with-xarray +10 -29
@@ -3363,29 +3363,12 @@ static void memcg_wb_domain_size_changed*/ #define MEM_CGROUP_ID_MAX ((1UL << MEM_CGROUP_ID_SHIFT) - 1) -static DEFINE_IDR (mem_cgroup_idr); -static DEFINE_SPINLOCK (memcg_idr_lock); - -static int mem_cgroup_alloc_id (void ) -{ -int ret; - -idr_preload (GFP_KERNEL ); -spin_lock (&memcg_idr_lock); - ret =idr_alloc (&mem_cgroup_idr,NULL ,1 ,MEM_CGROUP_ID_MAX +1 , -GFP_NOWAIT ); -spin_unlock (&memcg_idr_lock); -idr_preload_end (); -return ret; -} +static DEFINE_XARRAY_ALLOC1 (mem_cgroup_ids);static void mem_cgroup_id_remove (struct mem_cgroup *memcg) {if (memcg->id.id >0 ) { -spin_lock (&memcg_idr_lock); -idr_remove (&mem_cgroup_idr, memcg->id.id); -spin_unlock (&memcg_idr_lock); - +xa_erase (&mem_cgroup_ids, memcg->id.id); memcg->id.id =0 ; } }
@@ -3420,7 +3403,7 @@ static inline void mem_cgroup_id_put(strstruct mem_cgroup *mem_cgroup_from_id (unsigned short id) {WARN_ON_ONCE (!rcu_read_lock_held ()); -return idr_find (&mem_cgroup_idr, id); +return xa_load (&mem_cgroup_ids, id); }#ifdef CONFIG_SHRINKER_DEBUG
@@ -3513,17 +3496,17 @@ static struct mem_cgroup *mem_cgroup_allstruct mem_cgroup *memcg;int node, cpu;int __maybe_unused i; -long error = -ENOMEM ; +long error; memcg =kzalloc (struct_size (memcg, nodeinfo, nr_node_ids),GFP_KERNEL );if (!memcg) -return ERR_PTR (error); +return ERR_PTR (-ENOMEM ); - memcg->id.id =mem_cgroup_alloc_id (); -if (memcg->id.id <0 ) { - error = memcg->id.id; + error =xa_alloc (&mem_cgroup_ids, &memcg->id.id,NULL , +XA_LIMIT (1 ,MEM_CGROUP_ID_MAX ),GFP_KERNEL ); +if (error) goto fail; - } + error = -ENOMEM ; memcg->vmstats =kzalloc (sizeof (struct memcg_vmstats ),GFP_KERNEL_ACCOUNT );
@@ -3664,9 +3647,7 @@ static int mem_cgroup_css_online(struct* publish it here at the end of onlining. This matches the * regular ID destruction during offlining. */ -spin_lock (&memcg_idr_lock); -idr_replace (&mem_cgroup_idr, memcg, memcg->id.id); -spin_unlock (&memcg_idr_lock); +xa_store (&mem_cgroup_ids, memcg->id.id, memcg,GFP_KERNEL );return 0 ; offline_kmem:
_
Patches currently in -mm which might be from [email protected] are