| Message ID | 20250315174930.1769599-2-shakeel.butt@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | memcg: cleanup per-cpu stock | expand |
On Sat, Mar 15, 2025 at 10:49:22AM -0700, Shakeel Butt wrote: > refill_stock can not be called with root memcg, so there is no need to > check it. > > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
On 3/15/25 18:49, Shakeel Butt wrote: > refill_stock can not be called with root memcg, so there is no need to > check it. > > Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Vlastimil Babka <vbabka@suse.cz> It's not trivial to verify this so I'd add VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); as Roman suggested in patch 4 reply. > --- > mm/memcontrol.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index b29433eb17fa..c09a32e93d39 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1883,6 +1883,7 @@ static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > drain_stock(stock); > } > > +/* Should never be called with root_mem_cgroup. */ > static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > { > unsigned long flags; > @@ -1892,8 +1893,6 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > * In case of unlikely failure to lock percpu stock_lock > * uncharge memcg directly. > */ > - if (mem_cgroup_is_root(memcg)) > - return; > page_counter_uncharge(&memcg->memory, nr_pages); > if (do_memsw_account()) > page_counter_uncharge(&memcg->memsw, nr_pages);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b29433eb17fa..c09a32e93d39 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1883,6 +1883,7 @@ static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) drain_stock(stock); } +/* Should never be called with root_mem_cgroup. */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { unsigned long flags; @@ -1892,8 +1893,6 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) * In case of unlikely failure to lock percpu stock_lock * uncharge memcg directly. */ - if (mem_cgroup_is_root(memcg)) - return; page_counter_uncharge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages);
refill_stock can not be called with root memcg, so there is no need to check it. Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> --- mm/memcontrol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)