memcg: avoid refill_stock for root memcg
Subsystems (3)
Shakeel Butt
maintainerPATCH 1/1 memcg: avoid refill_stock for root memcg
We never charge the page counters of root memcg, so there is no need to put root memcg in the memcg stock. At the moment, refill_stock() can be called from try_charge_memcg(), obj_cgroup_uncharge_pages() and mem_cgroup_uncharge_skmem().
The try_charge_memcg() and mem_cgroup_uncharge_skmem() are never called with root memcg, so those are fine. However obj_cgroup_uncharge_pages() can potentially call refill_stock() with root memcg if the objcg object has been reparented over to the root memcg. Let's just avoid refill_stock() from obj_cgroup_uncharge_pages() for root memcg.
--- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/memcontrol.c +2 -1
@@ -2643,7 +2643,8 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,mod_memcg_state (memcg,MEMCG_KMEM , -nr_pages);memcg1_account_kmem (memcg, -nr_pages); -refill_stock (memcg, nr_pages); +if (!mem_cgroup_is_root (memcg)) +refill_stock (memcg, nr_pages);css_put (&memcg->css); }
Signature · 1 line
2.47.1
Quoted 10 lines · Shakeel Butt
We never charge the page counters of root memcg, so there is no need to put root memcg in the memcg stock. At the moment,
refill_stock()can be called fromtry_charge_memcg(),obj_cgroup_uncharge_pages()andmem_cgroup_uncharge_skmem().The
try_charge_memcg()andmem_cgroup_uncharge_skmem()are never called with root memcg, so those are fine. Howeverobj_cgroup_uncharge_pages()can potentially callrefill_stock()with root memcg if the objcg object has been reparented over to the root memcg. Let's just avoidrefill_stock()fromobj_cgroup_uncharge_pages()for root memcg.
Makes sense. It is just pointless draining of a different memcg.
Quoted 1 line
Signed-off-by Shakeel Butt <[email protected]>
Thanks!
Quoted 21 lines
--- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/memcontrol.c +2
-1@@ -2643,7 +2643,8 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg,mod_memcg_state (memcg,MEMCG_KMEM , -nr_pages);memcg1_account_kmem (memcg, -nr_pages); -refill_stock (memcg, nr_pages); +if (!mem_cgroup_is_root (memcg)) +refill_stock (memcg, nr_pages);css_put (&memcg->css); }Signature · 1 line
2.47.1
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 5 lines · Shakeel Butt
We never charge the page counters of root memcg, so there is no need to put root memcg in the memcg stock. At the moment,
refill_stock()can be called fromtry_charge_memcg(),obj_cgroup_uncharge_pages()andmem_cgroup_uncharge_skmem().
Quoted 7 lines
The
try_charge_memcg()andmem_cgroup_uncharge_skmem()are never called with root memcg, so those are fine. Howeverobj_cgroup_uncharge_pages()can potentially callrefill_stock()with root memcg if the objcg object has been reparented over to the root memcg. Let's just avoidrefill_stock()fromobj_cgroup_uncharge_pages()for root memcg.Signed-off-by Shakeel Butt <[email protected]>