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,URIBL_BLOCKED, 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 A8D08C433DB for ; Thu, 4 Feb 2021 08:04:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D684D64F59 for ; Thu, 4 Feb 2021 08:04:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D684D64F59 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 1CB9D6B006E; Thu, 4 Feb 2021 03:04:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 17D1F6B0070; Thu, 4 Feb 2021 03:04:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 044DD6B0071; Thu, 4 Feb 2021 03:04:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0020.hostedemail.com [216.40.44.20]) by kanga.kvack.org (Postfix) with ESMTP id E32486B006E for ; Thu, 4 Feb 2021 03:04:16 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AFA5C8249980 for ; Thu, 4 Feb 2021 08:04:16 +0000 (UTC) X-FDA: 77779847712.20.bear00_5c07930275da Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 8608F180C07A3 for ; Thu, 4 Feb 2021 08:04:16 +0000 (UTC) X-HE-Tag: bear00_5c07930275da X-Filterd-Recvd-Size: 10543 Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Thu, 4 Feb 2021 08:04:15 +0000 (UTC) Received: from [192.168.15.247] by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l7Zc1-001eeV-F4; Thu, 04 Feb 2021 11:03:37 +0300 Subject: Re: [v6 PATCH 05/11] mm: memcontrol: rename shrinker_map to shrinker_info 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-6-shy828301@gmail.com> From: Kirill Tkhai Message-ID: Date: Thu, 4 Feb 2021 11:03:37 +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-6-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: > The following patch is going to add nr_deferred into shrinker_map, the change will > make shrinker_map not only include map anymore, so rename it to "memcg_shrinker_info". > And this should make the patch adding nr_deferred cleaner and readable and make > review easier. Also remove the "memcg_" prefix. > > Acked-by: Vlastimil Babka > Signed-off-by: Yang Shi Acked-by: Kirill Tkhai > --- > include/linux/memcontrol.h | 8 ++--- > mm/memcontrol.c | 6 ++-- > mm/vmscan.c | 62 +++++++++++++++++++------------------- > 3 files changed, 38 insertions(+), 38 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1739f17e0939..4c9253896e25 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -96,7 +96,7 @@ struct lruvec_stat { > * Bitmap of shrinker::id corresponding to memcg-aware shrinkers, > * which have elements charged to this memcg. > */ > -struct memcg_shrinker_map { > +struct shrinker_info { > struct rcu_head rcu; > unsigned long map[]; > }; > @@ -118,7 +118,7 @@ struct mem_cgroup_per_node { > > struct mem_cgroup_reclaim_iter iter; > > - struct memcg_shrinker_map __rcu *shrinker_map; > + struct shrinker_info __rcu *shrinker_info; > > struct rb_node tree_node; /* RB tree node */ > unsigned long usage_in_excess;/* Set to the value by which */ > @@ -1581,8 +1581,8 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) > return false; > } > > -int alloc_shrinker_maps(struct mem_cgroup *memcg); > -void free_shrinker_maps(struct mem_cgroup *memcg); > +int alloc_shrinker_info(struct mem_cgroup *memcg); > +void free_shrinker_info(struct mem_cgroup *memcg); > void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id); > #else > #define mem_cgroup_sockets_enabled 0 > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index f5c9a0d2160b..f64ad0d044d9 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5246,11 +5246,11 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) > struct mem_cgroup *memcg = mem_cgroup_from_css(css); > > /* > - * A memcg must be visible for expand_shrinker_maps() > + * A memcg must be visible for expand_shrinker_info() > * by the time the maps are allocated. So, we allocate maps > * here, when for_each_mem_cgroup() can't skip it. > */ > - if (alloc_shrinker_maps(memcg)) { > + if (alloc_shrinker_info(memcg)) { > mem_cgroup_id_remove(memcg); > return -ENOMEM; > } > @@ -5314,7 +5314,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) > vmpressure_cleanup(&memcg->vmpressure); > cancel_work_sync(&memcg->high_work); > mem_cgroup_remove_from_trees(memcg); > - free_shrinker_maps(memcg); > + free_shrinker_info(memcg); > memcg_free_kmem(memcg); > mem_cgroup_free(memcg); > } > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 641077b09e5d..9436f9246d32 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -190,20 +190,20 @@ 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 void free_shrinker_map_rcu(struct rcu_head *head) > +static void free_shrinker_info_rcu(struct rcu_head *head) > { > - kvfree(container_of(head, struct memcg_shrinker_map, rcu)); > + kvfree(container_of(head, struct shrinker_info, rcu)); > } > > -static int expand_one_shrinker_map(struct mem_cgroup *memcg, > +static int expand_one_shrinker_info(struct mem_cgroup *memcg, > int size, int old_size) > { > - struct memcg_shrinker_map *new, *old; > + struct shrinker_info *new, *old; > int nid; > > for_each_node(nid) { > old = rcu_dereference_protected( > - mem_cgroup_nodeinfo(memcg, nid)->shrinker_map, true); > + mem_cgroup_nodeinfo(memcg, nid)->shrinker_info, true); > /* Not yet online memcg */ > if (!old) > return 0; > @@ -216,17 +216,17 @@ static int expand_one_shrinker_map(struct mem_cgroup *memcg, > memset(new->map, (int)0xff, old_size); > memset((void *)new->map + old_size, 0, size - old_size); > > - rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_map, new); > - call_rcu(&old->rcu, free_shrinker_map_rcu); > + rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, new); > + call_rcu(&old->rcu, free_shrinker_info_rcu); > } > > return 0; > } > > -void free_shrinker_maps(struct mem_cgroup *memcg) > +void free_shrinker_info(struct mem_cgroup *memcg) > { > struct mem_cgroup_per_node *pn; > - struct memcg_shrinker_map *map; > + struct shrinker_info *info; > int nid; > > if (mem_cgroup_is_root(memcg)) > @@ -234,15 +234,15 @@ void free_shrinker_maps(struct mem_cgroup *memcg) > > for_each_node(nid) { > pn = mem_cgroup_nodeinfo(memcg, nid); > - map = rcu_dereference_protected(pn->shrinker_map, true); > - kvfree(map); > - rcu_assign_pointer(pn->shrinker_map, NULL); > + info = rcu_dereference_protected(pn->shrinker_info, true); > + kvfree(info); > + rcu_assign_pointer(pn->shrinker_info, NULL); > } > } > > -int alloc_shrinker_maps(struct mem_cgroup *memcg) > +int alloc_shrinker_info(struct mem_cgroup *memcg) > { > - struct memcg_shrinker_map *map; > + struct shrinker_info *info; > int nid, size, ret = 0; > > if (mem_cgroup_is_root(memcg)) > @@ -251,20 +251,20 @@ int alloc_shrinker_maps(struct mem_cgroup *memcg) > down_write(&shrinker_rwsem); > size = NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); > for_each_node(nid) { > - map = kvzalloc_node(sizeof(*map) + size, GFP_KERNEL, nid); > - if (!map) { > - free_shrinker_maps(memcg); > + info = kvzalloc_node(sizeof(*info) + size, GFP_KERNEL, nid); > + if (!info) { > + free_shrinker_info(memcg); > ret = -ENOMEM; > break; > } > - rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_map, map); > + rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); > } > up_write(&shrinker_rwsem); > > return ret; > } > > -static int expand_shrinker_maps(int new_id) > +static int expand_shrinker_info(int new_id) > { > int size, old_size, ret = 0; > int new_nr_max = new_id + 1; > @@ -282,7 +282,7 @@ static int expand_shrinker_maps(int new_id) > do { > if (mem_cgroup_is_root(memcg)) > continue; > - ret = expand_one_shrinker_map(memcg, size, old_size); > + ret = expand_one_shrinker_info(memcg, size, old_size); > if (ret) { > mem_cgroup_iter_break(NULL, memcg); > goto out; > @@ -298,13 +298,13 @@ static int expand_shrinker_maps(int new_id) > void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) > { > if (shrinker_id >= 0 && memcg && !mem_cgroup_is_root(memcg)) { > - struct memcg_shrinker_map *map; > + struct shrinker_info *info; > > rcu_read_lock(); > - map = rcu_dereference(memcg->nodeinfo[nid]->shrinker_map); > + info = rcu_dereference(memcg->nodeinfo[nid]->shrinker_info); > /* Pairs with smp mb in shrink_slab() */ > smp_mb__before_atomic(); > - set_bit(shrinker_id, map->map); > + set_bit(shrinker_id, info->map); > rcu_read_unlock(); > } > } > @@ -335,7 +335,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shrinker) > goto unlock; > > if (id >= shrinker_nr_max) { > - if (expand_shrinker_maps(id)) { > + if (expand_shrinker_info(id)) { > idr_remove(&shrinker_idr, id); > goto unlock; > } > @@ -664,7 +664,7 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, > static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > struct mem_cgroup *memcg, int priority) > { > - struct memcg_shrinker_map *map; > + struct shrinker_info *info; > unsigned long ret, freed = 0; > int i; > > @@ -674,12 +674,12 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > if (!down_read_trylock(&shrinker_rwsem)) > return 0; > > - map = rcu_dereference_protected(memcg->nodeinfo[nid]->shrinker_map, > - true); > - if (unlikely(!map)) > + info = rcu_dereference_protected(memcg->nodeinfo[nid]->shrinker_info, > + true); > + if (unlikely(!info)) > goto unlock; > > - for_each_set_bit(i, map->map, shrinker_nr_max) { > + for_each_set_bit(i, info->map, shrinker_nr_max) { > struct shrink_control sc = { > .gfp_mask = gfp_mask, > .nid = nid, > @@ -690,7 +690,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > shrinker = idr_find(&shrinker_idr, i); > if (unlikely(!shrinker || shrinker == SHRINKER_REGISTERING)) { > if (!shrinker) > - clear_bit(i, map->map); > + clear_bit(i, info->map); > continue; > } > > @@ -701,7 +701,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > > ret = do_shrink_slab(&sc, shrinker, priority); > if (ret == SHRINK_EMPTY) { > - clear_bit(i, map->map); > + clear_bit(i, info->map); > /* > * After the shrinker reported that it had no objects to > * free, but before we cleared the corresponding bit in >