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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 B20ACC2BBCA for ; Tue, 15 Dec 2020 23:10:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4E8D422C7B for ; Tue, 15 Dec 2020 23:10:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E8D422C7B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DD1FF8D0002; Tue, 15 Dec 2020 18:10:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D52A88D0001; Tue, 15 Dec 2020 18:10:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF75E8D0002; Tue, 15 Dec 2020 18:10:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0089.hostedemail.com [216.40.44.89]) by kanga.kvack.org (Postfix) with ESMTP id 9838B8D0001 for ; Tue, 15 Dec 2020 18:10:41 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 63CF48249980 for ; Tue, 15 Dec 2020 23:10:41 +0000 (UTC) X-FDA: 77597063082.02.wash74_4716b9b27427 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 3FD0710097AA0 for ; Tue, 15 Dec 2020 23:10:41 +0000 (UTC) X-HE-Tag: wash74_4716b9b27427 X-Filterd-Recvd-Size: 6548 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 23:10:40 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id p22so22803982edu.11 for ; Tue, 15 Dec 2020 15:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CNCYDyfLbqK85vDm5hjHzQWbOVjNJhjXu61wGctb+F8=; b=YWJVa18gdWSNQd4V4MwE52xizIm2FtuItrZoGSkcGOMW5blpZ9uMJllLtBIQVb1CR5 XoXCOdXMg29elarfEMZsEry1wt+aLJqvxptQXrx0sIJK1n56HCde4EYfzO145uu9GkOH N4O9zXHa7kn+vi1g+3fMMNdD4a8aumfj3WlvefmbH/Eb4isYfgNTZhTEDH3NY9jRHQ69 M6BLwg/x9fbcwYn/5PqWbixwA5DKF91wcIT4OAIrtkW36M0GU/Ds9hrvY7v74qqEKzcn V0tRRtSmijTbHa8UjXc9vYhAdCDiOEMzAvkkkuvrdJKUEtAjbFrGMcucF4b1oQ5TX8Mj 5bKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CNCYDyfLbqK85vDm5hjHzQWbOVjNJhjXu61wGctb+F8=; b=bXmSsJgFB29tfIBVOloWa96H2mgwzPUfXzgcieB5Yjfj06ApNj0BLgXfPC3Fiasf/6 tJAKlzT2Nf0EAWE6xhwhmQXKY6YJNu+ferOnmnzO0AUDrXTxyapeQSSEgEus/xXJbxYl MD9rxQHd+w0cE9BOSJEwhB6YzzhB9y374Vo671oamM8rFGexzmj4iE+zzceDsNSUnbkn 08eXF8VMbTExFc/PZSMwQs7XoWnKeOxRoLEw36UV08TiJU578Abg03trTbLtSnMBQuQD ldhqFwyOuCYEmc+JZ6OsKnRg0aIOw5nOcp1hrt99O3/s5jX7VksDxxU8C6tYEIlePvRP c2Zg== X-Gm-Message-State: AOAM532v5mn1cLtAgo3JQGKPNazmaa5E693xtyV2NZMymv1BHaOPeHNT okBGp2YuxdQnFyWZJKmWIiIOh5icpqVW01rcNqA= X-Google-Smtp-Source: ABdhPJxR+ByMCJElfTfLUQkytyJl4Gal4PtfC6HQ9qud4xb2PhRYCwELfYt/bF2MkYq2a+l14IdNcS18t1x+Y/rYCTA= X-Received: by 2002:a05:6402:ca2:: with SMTP id cn2mr31375599edb.137.1608073839676; Tue, 15 Dec 2020 15:10:39 -0800 (PST) MIME-Version: 1.0 References: <20201214223722.232537-1-shy828301@gmail.com> <20201214223722.232537-9-shy828301@gmail.com> <20201215030757.GO3913616@dread.disaster.area> In-Reply-To: <20201215030757.GO3913616@dread.disaster.area> From: Yang Shi Date: Tue, 15 Dec 2020 15:10:28 -0800 Message-ID: Subject: Re: [v2 PATCH 8/9] mm: memcontrol: reparent nr_deferred when memcg offline To: Dave Chinner Cc: Roman Gushchin , Kirill Tkhai , Shakeel Butt , Johannes Weiner , Michal Hocko , Andrew Morton , Linux MM , Linux FS-devel Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" 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 7:08 PM Dave Chinner wrote: > > 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. Fine to me. Will incorporate in v3. > > > + > > /** > > * 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