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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E544C7EE23 for ; Sun, 26 Feb 2023 14:54:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E222D6B0072; Sun, 26 Feb 2023 09:54:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DD21F6B0073; Sun, 26 Feb 2023 09:54:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C999B6B0074; Sun, 26 Feb 2023 09:54:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B7E986B0072 for ; Sun, 26 Feb 2023 09:54:24 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9779814011C for ; Sun, 26 Feb 2023 14:54:24 +0000 (UTC) X-FDA: 80509738848.25.639870F Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf13.hostedemail.com (Postfix) with ESMTP id 455472000A for ; Sun, 26 Feb 2023 14:54:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VnciP26P; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677423262; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ym+ZCFFhyz2OKDbObxBs76oK8kUbnOHW3yp4MOyvAK0=; b=PS79atbUTP9WhRDbr71NjsoiX9Tr6bqZskzo17wuqSQ/DbPMo8+nr4ras43UhHtfnnoyM+ m6bVbhOpkyD3/zSY/sU/ryuqD7D8dlGgM3IFmAFRrTsxPJoqwRgnxf6f7jHLZ1SXTS8JxC sjSl1dXpQUFRcjTvzAjyco5zQ9D5xxw= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VnciP26P; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677423262; a=rsa-sha256; cv=none; b=KsKxLrSsX2WU9BXFOm49CnQXpKxE+0G27qiYZhDOnHiOA+o5LGRW4cyM8imbCfmSKNbD4D vWo6GL8/0fHdSrdj3DYMYRSciIzdSRzcMxh71CuV2lxjvVZBozewgvqKDZifh+AwKOkfUf 5uJMSiO3BL8/jKhqRrznyW7aIfnu/Ps= Received: by mail-pj1-f47.google.com with SMTP id m8-20020a17090a4d8800b002377bced051so7621609pjh.0 for ; Sun, 26 Feb 2023 06:54:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Ym+ZCFFhyz2OKDbObxBs76oK8kUbnOHW3yp4MOyvAK0=; b=VnciP26Phw2gzoyflvmtNAAixrJj/Dq3kwo61wChdOe1akIh3zxPsxBgQQtVKjQouQ YIHLIUqEihDSSd+znrEJNdpKTtZrWUjSD/FSSm0GoY4m/TBrN9+T59Pbg7nh6hJY9W7O Tr1X3KWS9DbE6vijlR+A4Bsn2+zWstqxliNsgArY9yPs1kOz7zSljY4pkQd4HdE3j33I xjVYgzSjF96ppA8d8mVj3spN7cWhhS1Osl7aC+eX80L3YDCZnmY7HWYU+aNzLQp9wERD b3sEtdiXqByShkJS0XWQdPvOE4fXCkQJYmeHSn1U+BIvd+njLbdqnlpxF/OXqJTvyHF4 DPdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ym+ZCFFhyz2OKDbObxBs76oK8kUbnOHW3yp4MOyvAK0=; b=kjOI9lRSxgtHZ7X+1Og5aJhwY8S7ftOCqAve7ivR0DWecB2//zeyhXVt5N91ev3mTl nwQim4ZZJvgJMYrGjHfcGMPQpkaAJPNRYIsvu82kJ6T/PC744Q0hjYhKFxOwB7+d35Bv iKJS5BXvB1J9mYpti4gm1M4wvrvgjGy5l0ulTWhuc1VYHg5y4XjR5ojkRWkKkmIHsR99 WRJ/Zo8EPKxNxj9fGZXe0Ll/36Pe5zB2NenMSeTiwJmAZMXFLPgIuMIPg3fjo74OBw6G Na/KCmouy922Cq29CINgjLTItnRfCi1Y3olVoK5iIyhaVvSAvYjA1hEQYeA2pCK5ZO1+ GAFA== X-Gm-Message-State: AO0yUKWbfY5CsAi0OL/V4HxR3scQIRl3J1yf4TgnoVqstUrUyK7dgG3m sbr5Map8+l22MioDP/WDVh4saA== X-Google-Smtp-Source: AK7set/ZUeH+SuUyppg97YjNUA5G2loUoVgjwib6nXLN0qRJC3HyTHjarQvnqK5qcI74nyeUePMX2w== X-Received: by 2002:a17:902:a3cd:b0:19a:f556:e386 with SMTP id q13-20020a170902a3cd00b0019af556e386mr21191328plb.0.1677423261091; Sun, 26 Feb 2023 06:54:21 -0800 (PST) Received: from [10.200.9.56] ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id h3-20020a170902f7c300b0019aafc422fcsm2743516plw.240.2023.02.26.06.54.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Feb 2023 06:54:20 -0800 (PST) Message-ID: Date: Sun, 26 Feb 2023 22:54:14 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH v3 1/8] mm: vmscan: add a map_nr_max field to shrinker_info Content-Language: en-US To: akpm@linux-foundation.org, tkhai@ya.ru, hannes@cmpxchg.org, shakeelb@google.com, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, david@redhat.com, shy828301@gmail.com Cc: sultan@kerneltoast.com, dave@stgolabs.net, penguin-kernel@I-love.SAKURA.ne.jp, paulmck@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20230226144655.79778-1-zhengqi.arch@bytedance.com> <20230226144655.79778-2-zhengqi.arch@bytedance.com> From: Qi Zheng In-Reply-To: <20230226144655.79778-2-zhengqi.arch@bytedance.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 455472000A X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: r8xgk5gmrjtafdin7q166cai3edmdhge X-HE-Tag: 1677423262-854697 X-HE-Meta: U2FsdGVkX1+Y+bKAlxPVpVdgxLh3Nqwl2EsVPqPhZFQgq2lseJj61kScZrVQ6HLJRRkYZlYPGNoBdDxl7gGrA2w5hxW/StgTKU3pdWqa8jLckLraRv2q94w6kVveSi5RdXWfzmjQctiuPIsiFklrQmtU8FGI9HU1Cv0m8DgsWT8NUqA7QLAai6nxgROB5WAxOQNT78yOZYc2ZupIbB1E6ntBUZ+ZlRP8KDb3NmU3NzytgO7rkC60j8h4VmDHFDli8ynJkEffvsOPAoI4Sq9AmIVgfVSoVdOIQgXg2h9qmTeeS+uYJ1Fc2Q7Ay1ioPvQfI1N3pKjmu8d8GR3nndTqRxrKeHfGeoCTovF2CjPIi3aVtvIXq3zo+T6Ww+sGhxqNpglpT+/Tsw6F9EHzyX/2JMBxYdtjS6OG/pK9LWFjvFLr9VqGyKCgWPkhlpe3WutPlzk//0g1N0W1U2xDX5FBAnOqxRLGkxWFHlk4+f1olVkixLWP9WHv9gz3HZsMaZDUOR1Iq8SgesiBxASqA60zmjtV/0SO2eefl+ub98ukbxPGA9XT4XByYsOMDXhzr9jdA8Y/xmOqOTSzj/8Y0aMak3E4lSPUG0BM8Pud4hj2dmTcTj+IiFTaWiXHIFX/9lFRnhlAdmUw/f8f1G34DsJOjo9UvXxvsK7g+QOxuzVL15zKQxST1+4zghfUj0EKupYSEKUTxYPPca+jJ25p56wtjWGC+YR1nNo7q+X1e0ml6KT6CoKqcmhEAZwr57bKpjU7+eEGPZzd3j88qj9cSa2lCEigbihCW1hix9nhjgsUjcj8QeyfD7MqYvU7NoFLCJwarVLmm8aS9rW1QUJn1eXs7dbKUXZOUlrazK1pyCsGhrLsxHZe0H3nEHdftUIbNw0gAS5qiFhMUiw8ouK3kpWJedzd0FqxMc69OUJ/PQg2MSeDZLcdKlZ3zuYz0Zok9T0Q6wQIc/kXw51BQXve9tq 8LEynXLm QywUNjq8kGphjhTH8V3xOMBERvzseC9S0YQGKDza0QgGwZOlKSrXCRHNfMsp7UCJlWu67k66xRdmAFprUPBA7CkzO6CIgPeNGGWUTJ0CGXFEXQRBgRF9GvnbX4CLe/dNFEwzfwjJ3JXbxZWsFmMYunI5+UaszX0db4uAahdrU+dbXAUY1f6MS0vmS4KosZXegp19MDiegpc5kK0k3JHoJFyrN4cTFs39dn4LWOTlwml9L/F795T445DJmShjNmkiNxoO0/ASnQv8hdkPdfORzqCR95Wv6mYoLq2zFMt4y7Q9OEu9ZzpTG4G/IGukcZjHZq7tsFTk9Q1eSh75oC99DAQ5wbZo0puSlDkcmNdx7Q0OfH/67j3VTYzdyk0JgTfkFrRVueWcBU0wZAFu0dvkXqN67SUyHibxAWJqc9us2nEgewVcE/gYllqPdx6gU5yoKdgHVHyNd0/P1GO2/IHesLD40hufyc/7SX0qiJNZ3uZuLHVPX+P4ltTrhqi4DyAh82Gu6P1ehF5yJWpSNIr90pVfV5XgcuEWs/xf7 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 2023/2/26 22:46, Qi Zheng wrote: > To prepare for the subsequent lockless memcg slab shrink, > add a map_nr_max field to struct shrinker_info to records > its own real shrinker_nr_max. > > Suggested-by: Kirill Tkhai > Signed-off-by: Qi Zheng > --- > include/linux/memcontrol.h | 1 + > mm/vmscan.c | 41 ++++++++++++++++++++++---------------- > 2 files changed, 25 insertions(+), 17 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index b6eda2ab205d..aa69ea98e2d8 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -97,6 +97,7 @@ struct shrinker_info { > struct rcu_head rcu; > atomic_long_t *nr_deferred; > unsigned long *map; > + int map_nr_max; > }; > > struct lruvec_stats_percpu { > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 9c1c5e8b24b8..546c07ccb3bc 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -224,9 +224,16 @@ static struct shrinker_info *shrinker_info_protected(struct mem_cgroup *memcg, > lockdep_is_held(&shrinker_rwsem)); > } > > +static inline bool need_expand(int new_nr_max, int old_nr_max) > +{ > + return round_up(new_nr_max, BITS_PER_LONG) > > + round_up(old_nr_max, BITS_PER_LONG); > +} > + > static int expand_one_shrinker_info(struct mem_cgroup *memcg, > int map_size, int defer_size, > - int old_map_size, int old_defer_size) > + int old_map_size, int old_defer_size, > + int new_nr_max) > { > struct shrinker_info *new, *old; > struct mem_cgroup_per_node *pn; > @@ -240,12 +247,17 @@ static int expand_one_shrinker_info(struct mem_cgroup *memcg, > if (!old) > return 0; > > + /* Already expanded this shrinker_info */ > + if (!need_expand(new_nr_max, old->map_nr_max)) > + return 0; Oops, need to continue here. > + > new = kvmalloc_node(sizeof(*new) + size, GFP_KERNEL, nid); > if (!new) > return -ENOMEM; > > new->nr_deferred = (atomic_long_t *)(new + 1); > new->map = (void *)new->nr_deferred + defer_size; > + new->map_nr_max = new_nr_max; > > /* map: set all old bits, clear all new bits */ > memset(new->map, (int)0xff, old_map_size); > @@ -295,6 +307,7 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) > } > info->nr_deferred = (atomic_long_t *)(info + 1); > info->map = (void *)info->nr_deferred + defer_size; > + info->map_nr_max = shrinker_nr_max; > rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); > } > up_write(&shrinker_rwsem); > @@ -302,23 +315,14 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) > return ret; > } > > -static inline bool need_expand(int nr_max) > -{ > - return round_up(nr_max, BITS_PER_LONG) > > - round_up(shrinker_nr_max, BITS_PER_LONG); > -} > - > static int expand_shrinker_info(int new_id) > { > int ret = 0; > - int new_nr_max = new_id + 1; > + int new_nr_max = round_up(new_id + 1, BITS_PER_LONG); > int map_size, defer_size = 0; > int old_map_size, old_defer_size = 0; > struct mem_cgroup *memcg; > > - if (!need_expand(new_nr_max)) > - goto out; > - > if (!root_mem_cgroup) > goto out; > > @@ -332,7 +336,8 @@ static int expand_shrinker_info(int new_id) > memcg = mem_cgroup_iter(NULL, NULL, NULL); > do { > ret = expand_one_shrinker_info(memcg, map_size, defer_size, > - old_map_size, old_defer_size); > + old_map_size, old_defer_size, > + new_nr_max); > if (ret) { > mem_cgroup_iter_break(NULL, memcg); > goto out; > @@ -352,9 +357,11 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) > > rcu_read_lock(); > info = rcu_dereference(memcg->nodeinfo[nid]->shrinker_info); > - /* Pairs with smp mb in shrink_slab() */ > - smp_mb__before_atomic(); > - set_bit(shrinker_id, info->map); > + if (!WARN_ON_ONCE(shrinker_id >= info->map_nr_max)) { > + /* Pairs with smp mb in shrink_slab() */ > + smp_mb__before_atomic(); > + set_bit(shrinker_id, info->map); > + } > rcu_read_unlock(); > } > } > @@ -432,7 +439,7 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) > for_each_node(nid) { > child_info = shrinker_info_protected(memcg, nid); > parent_info = shrinker_info_protected(parent, nid); > - for (i = 0; i < shrinker_nr_max; i++) { > + for (i = 0; i < child_info->map_nr_max; i++) { > nr = atomic_long_read(&child_info->nr_deferred[i]); > atomic_long_add(nr, &parent_info->nr_deferred[i]); > } > @@ -899,7 +906,7 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid, > if (unlikely(!info)) > goto unlock; > > - for_each_set_bit(i, info->map, shrinker_nr_max) { > + for_each_set_bit(i, info->map, info->map_nr_max) { > struct shrink_control sc = { > .gfp_mask = gfp_mask, > .nid = nid, -- Thanks, Qi