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 9D41BC678D5 for ; Wed, 8 Mar 2023 14:40:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 348CC280002; Wed, 8 Mar 2023 09:40:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F8FC280001; Wed, 8 Mar 2023 09:40:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C207280002; Wed, 8 Mar 2023 09:40:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0B12C280001 for ; Wed, 8 Mar 2023 09:40:13 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D1EF81A06B6 for ; Wed, 8 Mar 2023 14:40:12 +0000 (UTC) X-FDA: 80545991064.19.4CC6E1F Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf09.hostedemail.com (Postfix) with ESMTP id 9060D140022 for ; Wed, 8 Mar 2023 14:40:10 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cBTk++KU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=bPKI0frW; spf=pass (imf09.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678286410; 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=60iRe+TO5hl2RaReJQOAW22fyZFUmHKlK8uZfBodZLk=; b=MwjyAhHZsogann1xBgbM+OOAN5t5DTg56+FX05QhwU68fUNMXakVdAsi4ds2TpuoUUFJUx YreNwNhw+eHuXmZkuEIbkoxUkQNrFCww4vgbHBnNk1PC5EXgOrCOvvXdUIlKm7brz9sxww NfjOUIXMhmVVUndswRRbZcWVospIal0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cBTk++KU; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=bPKI0frW; spf=pass (imf09.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678286410; a=rsa-sha256; cv=none; b=HupcTIzbRBKFTomqCX2YD2WZeWnyPvt71RB14tvQ2e1YeFPYOHkISaheSr1bdsrdxZSbji RqVghTBrr3xMpIIMR3iI0s8HvlBJEjYn627l/4VNYaYBelEWhPzjbkMZog58LwgL9TZSv3 VdjIN99614D3qjuvbAEnE9e5GbCByO4= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E67291FE3D; Wed, 8 Mar 2023 14:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1678286408; h=from:from:reply-to: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; bh=60iRe+TO5hl2RaReJQOAW22fyZFUmHKlK8uZfBodZLk=; b=cBTk++KU6MuNwDMUwESpQjyELZV3QU4NsunM7u2I6Eqa705TCjbMYECbCWOJ81bkYsgVR+ bufJdvnrZ/dmhQ8QJNkySiekXnHRA6MzhSFE0QBa2U/m4PFTZ3V9fdCxMH7H6GNJOCP8Wp h2PmnvOZSfIE/kQPlpB+6cdecJnQHYw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1678286408; h=from:from:reply-to: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; bh=60iRe+TO5hl2RaReJQOAW22fyZFUmHKlK8uZfBodZLk=; b=bPKI0frWKZ7jX8pglWGUDRR5BsdmWozH1mOlXPzHehHq8/9ZJJlD8Hvv2uK9IOg449G9Bq A9hbeHFqCPbiVWAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8FED11391B; Wed, 8 Mar 2023 14:40:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DWbvIUieCGSVdAAAMHmgww (envelope-from ); Wed, 08 Mar 2023 14:40:08 +0000 Message-ID: Date: Wed, 8 Mar 2023 15:40:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v4 1/8] mm: vmscan: add a map_nr_max field to shrinker_info Content-Language: en-US To: Qi Zheng , 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, rppt@kernel.org 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: <20230307065605.58209-1-zhengqi.arch@bytedance.com> <20230307065605.58209-2-zhengqi.arch@bytedance.com> From: Vlastimil Babka In-Reply-To: <20230307065605.58209-2-zhengqi.arch@bytedance.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9060D140022 X-Rspam-User: X-Stat-Signature: e5s7ty3xndxy5uohutyfe5w4e5xc7rds X-HE-Tag: 1678286410-737638 X-HE-Meta: U2FsdGVkX19Q4uwcX87PbhDpMP8BWO6NS+R6B8aHrmixGIwDtMF19lXKTD1lM7h/U0H6oqvppFg1B9SM7fphV3X0pd7y3EPFzZMyK2DJ4qHNw1T5+uRj4QfKH8LwZHxVZFmYsvs2EN+NBTf8iGnGVu0FPTcuuAd4IyGBMF8tj7LnqJkse93EQ6N60grCXK7SJOwU//Zd7dYL9b1IGGva28+Oy40+5Xi/SUzbKBlAW40uOgQwValGT9Uif+lzGn7I7z6bWWrVUZdor4T8RNjrq23JNvK2bwb1vv6/u1NTQ+95vu+0BxHptkcqHlbC5zul2OuPQqv+eZH3eaEEEbN0Gs2xisqpTbf2ARs+XTy4QrEkQ3LcnHmN2ql4IqBsJQ10o7v4ooL5qCUjhoiElg5CXh+70ZCBdQ+D+7LqIg7bIvY2+DRZAJyGmY5Nn9uqJAAXibcEW+WQfQO3wZ7IanIgK6s9ZGx1A7QsYKYJmDx9gCDQhG1x+M7he5yhQ2AkfuZ774g6D9i3Twv6dv3g+aOZAOsn5V/X0mN2Cn7dL9gpmvorU1lsESygjfVd5HBoSv3DBCJckYPlHHUA+byB0hQmwAMKm3IEIPeB5gYnr3YYRiOEHAFkvowEbDmHOPfRGr7aQvpZmwaZsiBgV6fS1zRzY4LNcNLkj7K6R25B5Zb9s72tntdawNdFT+c+MsXCPJpwHYW+XxNDO/W8NaQCo3o8c2R9GI5QLkw8IJtswZSVZQ2b+LTk6skGwGRO3oGbQccc361e5UwD3vP6zViJ/hliQFxnlNam88NngHZHLBXRD3BxJJa8iG1DaPlbFVSGSLobM1d2J1I78PCM5nFINe5JxTpLE2TPgZsCNtMzlZSu73vHSINZG8HzQYRVyt3bpCW5MMwm2BEi6fB+UENIYXzu3qWKxMsz695jDqdncLDNxZ589Yq/vQuBr80OxxuoNAOIRajN+XQPrftwzWy4YtQ C3Z0S0/m T4f3ascGDq95ZQUIAdwUvUrXJlnSVBea5/foEIvH9AwQNM7JA2ZVv1ishpTKOu1x4lt29meKmU3zo+i/FvbuJWoAtkaboRTsVJ/8x2d+OUbzsm9HzpYrpPyGwbRERpCi0h8+nVfdKx5Gkd6dDUUUin+MF05PbzKjMXsMl4wMVsq00ty68AmqmuN1PklNA3jqzCl+MvlD4RAlCwRTVyzqjuIwLQqjt/a1LQTrUFcW2NOaq8z5mRrsuHXB2Ahh0V/W9YpmBwvANieONayocKetlqhmYgdnBXGhIHD6mZGGCTVo4+2FdddJnX8iOZUpX01/drBJRgjq5oUDpoGJCKU5DP4N81usJASXiwu3ZlwREUQ3DUtf4U/sRquFRlY1hrKD9zhmT 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 3/7/23 07:55, 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 Acked-by: Vlastimil Babka > --- > 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 9414226218f0..2dcc01682026 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)) > + continue; > + > 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,