From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B647C2BBCA for ; Tue, 15 Dec 2020 03:08:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D676F22473 for ; Tue, 15 Dec 2020 03:08:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D676F22473 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fromorbit.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 65AB78D0010; Mon, 14 Dec 2020 22:08:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E1DE6B00C0; Mon, 14 Dec 2020 22:08:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AF8F8D0010; Mon, 14 Dec 2020 22:08:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id 31CA56B00BF for ; Mon, 14 Dec 2020 22:08:01 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0200D181AEF2A for ; Tue, 15 Dec 2020 03:08:01 +0000 (UTC) X-FDA: 77594032362.09.farm59_2d0dada27420 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id DC0B2180AD837 for ; Tue, 15 Dec 2020 03:08:00 +0000 (UTC) X-HE-Tag: farm59_2d0dada27420 X-Filterd-Recvd-Size: 4714 Received: from mail109.syd.optusnet.com.au (mail109.syd.optusnet.com.au [211.29.132.80]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 03:08:00 +0000 (UTC) Received: from dread.disaster.area (pa49-179-6-140.pa.nsw.optusnet.com.au [49.179.6.140]) by mail109.syd.optusnet.com.au (Postfix) with ESMTPS id 2D011620E8; Tue, 15 Dec 2020 14:07:58 +1100 (AEDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1kp0gv-00455r-LR; Tue, 15 Dec 2020 14:07:57 +1100 Date: Tue, 15 Dec 2020 14:07:57 +1100 From: Dave Chinner To: Yang Shi Cc: guro@fb.com, ktkhai@virtuozzo.com, shakeelb@google.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [v2 PATCH 8/9] mm: memcontrol: reparent nr_deferred when memcg offline Message-ID: <20201215030757.GO3913616@dread.disaster.area> References: <20201214223722.232537-1-shy828301@gmail.com> <20201214223722.232537-9-shy828301@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201214223722.232537-9-shy828301@gmail.com> X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.3 cv=Ubgvt5aN c=1 sm=1 tr=0 cx=a_idp_d a=uDU3YIYVKEaHT0eX+MXYOQ==:117 a=uDU3YIYVKEaHT0eX+MXYOQ==:17 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=pGLkceISAAAA:8 a=7-415B0cAAAA:8 a=G0UjF7Cs0_CI2k58uiMA:9 a=CjuIK1q_8ugA:10 a=-RoEEKskQ1sA:10 a=biEYGPWJfzWAr4FL6Ov7:22 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Dec 14, 2020 at 02:37:21PM -0800, Yang Shi wrote: > Now shrinker's nr_deferred is per memcg for memcg aware shrinkers, add to parent's > corresponding nr_deferred when memcg offline. > > Signed-off-by: Yang Shi > --- > include/linux/shrinker.h | 4 ++++ > mm/memcontrol.c | 24 ++++++++++++++++++++++++ > mm/vmscan.c | 2 +- > 3 files changed, 29 insertions(+), 1 deletion(-) > > diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h > index 1eac79ce57d4..85cfc910dde4 100644 > --- a/include/linux/shrinker.h > +++ b/include/linux/shrinker.h > @@ -78,6 +78,10 @@ struct shrinker { > }; > #define DEFAULT_SEEKS 2 /* A good number if you don't know better. */ > > +#ifdef CONFIG_MEMCG > +extern int shrinker_nr_max; > +#endif > + > /* Flags */ > #define SHRINKER_REGISTERED (1 << 0) > #define SHRINKER_NUMA_AWARE (1 << 1) > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 321d1818ce3d..1f191a15bee1 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -59,6 +59,7 @@ > #include > #include > #include > +#include > #include "internal.h" > #include > #include > @@ -612,6 +613,28 @@ void memcg_set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) > } > } > > +static void memcg_reparent_shrinker_deferred(struct mem_cgroup *memcg) > +{ > + int i, nid; > + long nr; > + struct mem_cgroup *parent; > + struct memcg_shrinker_deferred *child_deferred, *parent_deferred; > + > + parent = parent_mem_cgroup(memcg); > + if (!parent) > + parent = root_mem_cgroup; > + > + for_each_node(nid) { > + child_deferred = memcg->nodeinfo[nid]->shrinker_deferred; > + parent_deferred = parent->nodeinfo[nid]->shrinker_deferred; > + for (i = 0; i < shrinker_nr_max; i ++) { > + nr = atomic_long_read(&child_deferred->nr_deferred[i]); > + atomic_long_add(nr, > + &parent_deferred->nr_deferred[i]); > + } > + } > +} I would place this function in vmscan.c alongside the shrink_slab_set_nr_deferred_memcg() function so that all the accounting is in the one place. > + > /** > * mem_cgroup_css_from_page - css of the memcg associated with a page > * @page: page of interest > @@ -5543,6 +5566,7 @@ static void mem_cgroup_css_offline(struct cgroup_subsys_state *css) > page_counter_set_low(&memcg->memory, 0); > > memcg_offline_kmem(memcg); > + memcg_reparent_shrinker_deferred(memcg); > wb_memcg_offline(memcg); > > drain_all_stock(memcg); > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 8d5bfd818acd..693a41e89969 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -201,7 +201,7 @@ DECLARE_RWSEM(shrinker_rwsem); > #define SHRINKER_REGISTERING ((struct shrinker *)~0UL) > > static DEFINE_IDR(shrinker_idr); > -static int shrinker_nr_max; > +int shrinker_nr_max; Then we don't need to make yet another variable global... Cheers, Dave. -- Dave Chinner david@fromorbit.com