From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Hocko Subject: Re: [PATCH] mm: memcontrol: drain stocks on resize limit Date: Wed, 9 May 2018 09:45:08 +0200 Message-ID: <20180509074508.GC32366@dhcp22.suse.cz> References: <20180504205548.110696-1-shakeelb@google.com> Mime-Version: 1.0 Return-path: Content-Disposition: inline In-Reply-To: <20180504205548.110696-1-shakeelb@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Shakeel Butt Cc: Andrew Morton , Greg Thelen , Johannes Weiner , Vladimir Davydov , Linux MM , Cgroups , LKML On Fri 04-05-18 13:55:48, Shakeel Butt wrote: > Resizing the memcg limit for cgroup-v2 drains the stocks before > triggering the memcg reclaim. Do the same for cgroup-v1 to make the > behavior consistent. > > Signed-off-by: Shakeel Butt Acked-by: Michal Hocko > --- > mm/memcontrol.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 25b148c2d222..e2d33a37f971 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2463,6 +2463,7 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg, > unsigned long max, bool memsw) > { > bool enlarge = false; > + bool drained = false; > int ret; > bool limits_invariant; > struct page_counter *counter = memsw ? &memcg->memsw : &memcg->memory; > @@ -2493,6 +2494,12 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg, > if (!ret) > break; > > + if (!drained) { > + drain_all_stock(memcg); > + drained = true; > + continue; > + } > + > if (!try_to_free_mem_cgroup_pages(memcg, 1, > GFP_KERNEL, !memsw)) { > ret = -EBUSY; > -- > 2.17.0.441.gb46fe60e1d-goog -- Michal Hocko SUSE Labs