hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: memcontrol: simplify the logic of objcg pinning memcg 

The obj_cgroup_release() and memcg_reparent_objcgs() are serialized by the
css_set_lock.  We do not need to care about objcg->memcg being released in
the process of obj_cgroup_release().  So there is no need to pin memcg
before releasing objcg.  Remove those pinning logic to simplfy the code.

There are only two places that modifies the objcg->memcg.  One is the
initialization to objcg->memcg in the memcg_online_kmem(), another is
objcgs reparenting in the memcg_reparent_objcgs().  It is also impossible
for the two to run in parallel.  So xchg() is unnecessary and it is enough
to use WRITE_ONCE().

Link: https://lkml.kernel.org/r/20210417043538.9793-7-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Roman Gushchin <guro@fb.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Muchun Song 2021-06-28 19:38:03 -07:00 committed by Linus Torvalds
parent 7467c39128
commit 9838354e16
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/memcontrol.c
View File

@ -261,7 +261,6 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,
static void obj_cgroup_release(struct percpu_ref *ref) static void obj_cgroup_release(struct percpu_ref *ref)
{ {
struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt); struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt);
struct mem_cgroup *memcg;
unsigned int nr_bytes; unsigned int nr_bytes;
unsigned int nr_pages; unsigned int nr_pages;
unsigned long flags; unsigned long flags;
@ -291,11 +290,9 @@ static void obj_cgroup_release(struct percpu_ref *ref)
nr_pages = nr_bytes >> PAGE_SHIFT; nr_pages = nr_bytes >> PAGE_SHIFT;
spin_lock_irqsave(&css_set_lock, flags); spin_lock_irqsave(&css_set_lock, flags);
memcg = obj_cgroup_memcg(objcg);
if (nr_pages) if (nr_pages)
obj_cgroup_uncharge_pages(objcg, nr_pages); obj_cgroup_uncharge_pages(objcg, nr_pages);
list_del(&objcg->list); list_del(&objcg->list);
mem_cgroup_put(memcg);
spin_unlock_irqrestore(&css_set_lock, flags); spin_unlock_irqrestore(&css_set_lock, flags);
percpu_ref_exit(ref); percpu_ref_exit(ref);
@ -330,17 +327,12 @@ static void memcg_reparent_objcgs(struct mem_cgroup *memcg,
spin_lock_irq(&css_set_lock); spin_lock_irq(&css_set_lock);
/* Move active objcg to the parent's list */ /* 1) Ready to reparent active objcg. */
xchg(&objcg->memcg, parent); list_add(&objcg->list, &memcg->objcg_list);
css_get(&parent->css); /* 2) Reparent active objcg and already reparented objcgs to parent. */
list_add(&objcg->list, &parent->objcg_list); list_for_each_entry(iter, &memcg->objcg_list, list)
WRITE_ONCE(iter->memcg, parent);
/* Move already reparented objcgs to the parent's list */ /* 3) Move already reparented objcgs to the parent's list */
list_for_each_entry(iter, &memcg->objcg_list, list) {
css_get(&parent->css);
xchg(&iter->memcg, parent);
css_put(&memcg->css);
}
list_splice(&memcg->objcg_list, &parent->objcg_list); list_splice(&memcg->objcg_list, &parent->objcg_list);
spin_unlock_irq(&css_set_lock); spin_unlock_irq(&css_set_lock);