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=-15.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 C70B9C433DB for ; Thu, 4 Feb 2021 08:42:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3A17F64F3E for ; Thu, 4 Feb 2021 08:42:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A17F64F3E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 81EA16B0005; Thu, 4 Feb 2021 03:42:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A9326B006C; Thu, 4 Feb 2021 03:42:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66EEB6B006E; Thu, 4 Feb 2021 03:42:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id 4C4B46B0005 for ; Thu, 4 Feb 2021 03:42:38 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0BAB3181AEF1F for ; Thu, 4 Feb 2021 08:42:38 +0000 (UTC) X-FDA: 77779944396.12.steam61_331580d275da Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id E3E7118019977 for ; Thu, 4 Feb 2021 08:42:37 +0000 (UTC) X-HE-Tag: steam61_331580d275da X-Filterd-Recvd-Size: 7690 Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 4 Feb 2021 08:42:37 +0000 (UTC) Received: from [192.168.15.247] by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l7aD7-001eyv-7R; Thu, 04 Feb 2021 11:41:57 +0300 Subject: Re: [v6 PATCH 08/11] mm: vmscan: use per memcg nr_deferred of shrinker To: Yang Shi , guro@fb.com, vbabka@suse.cz, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210203172042.800474-1-shy828301@gmail.com> <20210203172042.800474-9-shy828301@gmail.com> From: Kirill Tkhai Message-ID: <44cc18d2-5a47-91d0-dad2-599c251a3a8b@virtuozzo.com> Date: Thu, 4 Feb 2021 11:41:57 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210203172042.800474-9-shy828301@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 03.02.2021 20:20, Yang Shi wrote: > Use per memcg's nr_deferred for memcg aware shrinkers. The shrinker's nr_deferred > will be used in the following cases: > 1. Non memcg aware shrinkers > 2. !CONFIG_MEMCG > 3. memcg is disabled by boot parameter > > Signed-off-by: Yang Shi > --- > mm/vmscan.c | 94 +++++++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 77 insertions(+), 17 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index d9126f12890f..545422d2aeec 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -190,6 +190,13 @@ static int shrinker_nr_max; > #define NR_MAX_TO_SHR_MAP_SIZE(nr_max) \ > (DIV_ROUND_UP(nr_max, BITS_PER_LONG) * sizeof(unsigned long)) > > +static struct shrinker_info *shrinker_info_protected(struct mem_cgroup *memcg, > + int nid) > +{ > + return rcu_dereference_protected(memcg->nodeinfo[nid]->shrinker_info, > + lockdep_is_held(&shrinker_rwsem)); > +} Thanks for the helper. Why not to introduce and become to use it in old places in a separate patch? > + > static void free_shrinker_info_rcu(struct rcu_head *head) > { > kvfree(container_of(head, struct shrinker_info, rcu)); > @@ -204,8 +211,7 @@ static int expand_one_shrinker_info(struct mem_cgroup *memcg, > int size = m_size + d_size; > > for_each_node(nid) { > - old = rcu_dereference_protected( > - mem_cgroup_nodeinfo(memcg, nid)->shrinker_info, true); > + old = shrinker_info_protected(memcg, nid); > /* Not yet online memcg */ > if (!old) > return 0; > @@ -239,7 +245,7 @@ void free_shrinker_info(struct mem_cgroup *memcg) > > for_each_node(nid) { > pn = mem_cgroup_nodeinfo(memcg, nid); > - info = rcu_dereference_protected(pn->shrinker_info, true); > + info = shrinker_info_protected(memcg, nid); > kvfree(info); > rcu_assign_pointer(pn->shrinker_info, NULL); > } > @@ -358,6 +364,25 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) > up_write(&shrinker_rwsem); > } > > + > +static long count_nr_deferred_memcg(int nid, struct shrinker *shrinker, > + struct mem_cgroup *memcg) > +{ > + struct shrinker_info *info; > + > + info = shrinker_info_protected(memcg, nid); > + return atomic_long_xchg(&info->nr_deferred[shrinker->id], 0); > +} > + > +static long set_nr_deferred_memcg(long nr, int nid, struct shrinker *shrinker, > + struct mem_cgroup *memcg) > +{ > + struct shrinker_info *info; > + > + info = shrinker_info_protected(memcg, nid); > + return atomic_long_add_return(nr, &info->nr_deferred[shrinker->id]); > +} Names confuse me a little bit. What about xchg_nr_deferred_memcg() and add_nr_deferred_memcg()? > static bool cgroup_reclaim(struct scan_control *sc) > { > return sc->target_mem_cgroup; > @@ -396,6 +421,18 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) > { > } > > +static long count_nr_deferred_memcg(int nid, struct shrinker *shrinker, > + struct mem_cgroup *memcg) > +{ > + return 0; > +} > + > +static long set_nr_deferred_memcg(long nr, int nid, struct shrinker *shrinker, > + struct mem_cgroup *memcg) > +{ > + return 0; > +} > + > static bool cgroup_reclaim(struct scan_control *sc) > { > return false; > @@ -407,6 +444,39 @@ static bool writeback_throttling_sane(struct scan_control *sc) > } > #endif > > +static long count_nr_deferred(struct shrinker *shrinker, > + struct shrink_control *sc) > +{ > + int nid = sc->nid; > + > + if (!(shrinker->flags & SHRINKER_NUMA_AWARE)) > + nid = 0; > + > + if (sc->memcg && > + (shrinker->flags & SHRINKER_MEMCG_AWARE)) > + return count_nr_deferred_memcg(nid, shrinker, > + sc->memcg); > + > + return atomic_long_xchg(&shrinker->nr_deferred[nid], 0); > +} > + > + > +static long set_nr_deferred(long nr, struct shrinker *shrinker, > + struct shrink_control *sc) > +{ > + int nid = sc->nid; > + > + if (!(shrinker->flags & SHRINKER_NUMA_AWARE)) > + nid = 0; > + > + if (sc->memcg && > + (shrinker->flags & SHRINKER_MEMCG_AWARE)) > + return set_nr_deferred_memcg(nr, nid, shrinker, > + sc->memcg); > + > + return atomic_long_add_return(nr, &shrinker->nr_deferred[nid]); > +} > + > /* > * This misses isolated pages which are not accounted for to save counters. > * As the data only determines if reclaim or compaction continues, it is > @@ -539,14 +609,10 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, > long freeable; > long nr; > long new_nr; > - int nid = shrinkctl->nid; > long batch_size = shrinker->batch ? shrinker->batch > : SHRINK_BATCH; > long scanned = 0, next_deferred; > > - if (!(shrinker->flags & SHRINKER_NUMA_AWARE)) > - nid = 0; > - > freeable = shrinker->count_objects(shrinker, shrinkctl); > if (freeable == 0 || freeable == SHRINK_EMPTY) > return freeable; > @@ -556,7 +622,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, > * and zero it so that other concurrent shrinker invocations > * don't also do this scanning work. > */ > - nr = atomic_long_xchg(&shrinker->nr_deferred[nid], 0); > + nr = count_nr_deferred(shrinker, shrinkctl); > > total_scan = nr; > if (shrinker->seeks) { > @@ -647,14 +713,9 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, > next_deferred = 0; > /* > * move the unused scan count back into the shrinker in a > - * manner that handles concurrent updates. If we exhausted the > - * scan, there is no need to do an update. > + * manner that handles concurrent updates. > */ > - if (next_deferred > 0) > - new_nr = atomic_long_add_return(next_deferred, > - &shrinker->nr_deferred[nid]); > - else > - new_nr = atomic_long_read(&shrinker->nr_deferred[nid]); > + new_nr = set_nr_deferred(next_deferred, shrinker, shrinkctl); > > trace_mm_shrink_slab_end(shrinker, shrinkctl->nid, freed, nr, new_nr, total_scan); > return freed; > @@ -674,8 +735,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > if (!down_read_trylock(&shrinker_rwsem)) > return 0; > > - info = rcu_dereference_protected(memcg->nodeinfo[nid]->shrinker_info, > - true); > + info = shrinker_info_protected(memcg, nid); > if (unlikely(!info)) > goto unlock; > >