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 0D3FEC64EC7 for ; Sat, 25 Feb 2023 08:18:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7054E6B0071; Sat, 25 Feb 2023 03:18:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B5D96B0073; Sat, 25 Feb 2023 03:18:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57E3A6B0074; Sat, 25 Feb 2023 03:18:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 495486B0071 for ; Sat, 25 Feb 2023 03:18:25 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 06DA7140E59 for ; Sat, 25 Feb 2023 08:18:25 +0000 (UTC) X-FDA: 80505112170.03.51F2FA0 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf04.hostedemail.com (Postfix) with ESMTP id 2076D40006 for ; Sat, 25 Feb 2023 08:18:22 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="dkWq/lRI"; spf=pass (imf04.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677313103; 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=AsL47J7DzrSRjS/g3c5jkzLcMkIvj6gluZDiMTud1Ck=; b=fylJcLWrOieMdCDJ1TmSNAkPYp5ZAOmDF9HuXrypgehFO8BAXwrI0C+8iSgZsoc1ZbdJm9 p8VSNfnvRTfpyX/DiU6HGi+VpFJIfIx2tSqmWckaM7TXYlWNaOOzPum/M6wqisXn5gnam+ nvfiH6Rx6sWIwZLHv6esp6mX+6KGTE0= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="dkWq/lRI"; spf=pass (imf04.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=none) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677313103; a=rsa-sha256; cv=none; b=WTtZlYk0ZRFzujK2sTrYuZ+DBrr39Pu3cKZtMoeDiD7YbdWecXrETTMIZxT3Sdhqfhqs30 gSouGvx8ZtCWtbzMUkC1dCOPojaPuIYR+EPv8KzWHf75FS2cr0SoRQ6kd5YiEbdGTGX94l S/QlP54YX2V7EKS1zfVl6Uf9ehV3Trs= Received: by mail-pj1-f54.google.com with SMTP id u10so1333993pjc.5 for ; Sat, 25 Feb 2023 00:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1677313102; 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=AsL47J7DzrSRjS/g3c5jkzLcMkIvj6gluZDiMTud1Ck=; b=dkWq/lRIS6rF3yoxHvLbrsc7h7kNCFDAxZeSKhqpr44UZVR7WDMLX1PA5ZGwxEcwHc qD7knbmKLg0KDwIpHblMgaN7J3WibVarj7LHLM+TMrephoEh/XwzKGN0OJo7Zi3htey6 pNxGmuzPiVRVbA2P8IRp0lWGKtGWdr8ABlpMF4oQesQUMESKkRqd1tUwea4E8PS/qWHO X5xFSXx4bm4K0N2u4hDV/6yEJ9PKUsyJEqsnrhkrAklYtOD88bE5m4QPul+viV1mNfQF rUlT8WPf8C4I6HMKtrzPwFXBN1R8nzPlteSxJ+gf0E2QnHjzuagiw38OJEM4kVTFFaUo /evw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677313102; 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=AsL47J7DzrSRjS/g3c5jkzLcMkIvj6gluZDiMTud1Ck=; b=W7HQYjjaup6X+LlsJ9LdMt2e/kOHv45NLAafKfCNmdzcX/YpTkZbdOZVutVGk6OP81 mbfymp2DvrSUJWHPVzNc3smQYFIuZ+zRuXfoAfZOMLi0QEfkSXKAswimsoHyJhsg80Hl liVm1LRFc/Ebw1LdbLRA4UY6xdDhFKWwBSIi7JRempzzkKnrvtICGYSaYzCedrot9x5m rABClc+lpaDmM2sPy8Re9oc2O19jKuIttugRuMyyw7m3yJIYIU7dOzrpsYYIyGKVXhwQ 3Rhs+DfsUPpYfiyhLX7lyiommfFVSIZbp7mMm2iw1xGgg6n2HcQ83VwsCGkBdELnwpWb VDlw== X-Gm-Message-State: AO0yUKXTTvRVpOmdmbp6FyBN7HEFsifmZtvlPG7oiMp5QI5KPQ/4j2dn 8tWXk3rlZ/7Mb8VQ7pkUlxomew== X-Google-Smtp-Source: AK7set+6C8v4zlUBW6YX8TWQM59wHZsXC1+GAytwBOWDwTRxNjpB1aCiXdpz+VaxC/DOf9WWZJg2vw== X-Received: by 2002:a05:6a20:3d24:b0:cb:692e:6314 with SMTP id y36-20020a056a203d2400b000cb692e6314mr17184556pzi.6.1677313101621; Sat, 25 Feb 2023 00:18:21 -0800 (PST) Received: from [10.200.9.56] ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id v26-20020a62a51a000000b005a9131b6668sm735663pfm.2.2023.02.25.00.18.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 25 Feb 2023 00:18:21 -0800 (PST) Message-ID: <6f8f01b5-d802-db64-7725-8481c67c13a2@bytedance.com> Date: Sat, 25 Feb 2023 16:18: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 v2 1/7] mm: vmscan: add a map_nr_max field to shrinker_info Content-Language: en-US To: tkhai@ya.ru 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, Andrew Morton , Johannes Weiner , Shakeel Butt , Michal Hocko , Roman Gushchin , Muchun Song , David Hildenbrand , Yang Shi References: <20230223132725.11685-1-zhengqi.arch@bytedance.com> <20230223132725.11685-2-zhengqi.arch@bytedance.com> From: Qi Zheng In-Reply-To: <20230223132725.11685-2-zhengqi.arch@bytedance.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: qdiqgzm8dptp33w5xs5bsuoy1zi44iyq X-Rspamd-Queue-Id: 2076D40006 X-HE-Tag: 1677313102-671075 X-HE-Meta: U2FsdGVkX1/9Z5CrpI6cWNcylHAAi5tnQNnaU4i0baH1OUI9btkvqbRrPtxXcTwKF46Y3OUvUB0j/i8yghcU3GUzY+hwQRdrmrh6xx5IAeON3b3tARHRWJeiPvrH3v5b7GQVTI7dT/uNkNIKxKYfw8vLGgfww+Eg35ki3EFm7gKLn+ydOJV10LDZp95gaM1FZ13Rz2uZMkgIj1c+imsjiwApQvLKVVENvXZxPNvhFFQ/CWpwQk3tc8rRgZosRqp9EGq6ej5e/l7lCnOozeKTt5JozpfSyBjGC0qzxaRHiDcCVM+yg39o1tzQ58Xv053jpxzokt68Zfzz40QE2f+t0iMWK6cCm9Xet90X46tzT/r9yWvmHi616vjAB/L5dRQsQx5egPnGQvzOOCgVk/w+dCMs0csTk2fnaLWDgaxNjRSasS9NlOjWKDhJ22XtKZaDDfGebHOmZY4uh2YCObrmBG5TMGnD0R3mjP/nMejNSTZam1464hwQMDtcp4gMOMx6SHxBMZRkEAYIy6Idj7Gg/dgrPNT3wDzPCEj2Ge5G+XPnyyPqrRZEpzqaMC+DQNIzPqeEmAlP94wqSn9vVVG+xhL5d7x4UqznTYIKSE93iBbQJ3WKfylrHYoLp+6jpGB3SrNsPnDAs4fvjVXsRAD07Ag/TRtuxAXqrBrd9JNcPkknTlhWsWqjOaQ400CE/K5vq1wjCBIyqYtakbxYpm0FTqkmbfIlTfQ3pzLr5QuIgiIR7aN97W20EH5dQk8n/eyG25HNn96ko4yNGwjCN393XsXruw+mbR1g40jrRqA++B8b5qbdJccq7SMeS3CMdOz3lFFPSHSEQbRlKLx8ypggWzL2BOuJFR5jIAD+Os+I7pDGMkt/pOQZFJjcAFfFzL0BO+Mx3rI9FM/aRJOYGRcMJJSTR1CfLf3fBUGjYWfO8Ud7MfUFcXZaAzly5ny70Wia6OT9WfQe3Of9yvRv0YC XltLqzJk ulgECQA0baHEsDSpyitzDBv9ZUVqKoNOv8qEpibo8O9oklrqGJJz4+VKab8RI/ew0sGOL5J4pwwHYBO7+mS2I9x1KFzAwmpkWAFfPm1mkIbib5fIyyRHcBHYXZtmFBrIqVMyagjnHNHO5QZ41L59E9qpSHe3HC9YWkfc+EkD4mo884otGimQUxtdylHjz8zO/5XkYcq8PgDxrI9FV2fsnLLy9rgrnkEeND/VkBt0hJJ2/en3hj9XUGJP4MUPFyrJvhSCMv+fLYDHKWxPxaqH9Gc/TxvuvkzCOYvygxRofWZ5qfZFOti0MptCPCuBt3bv7Q4htC3oNAfAn6VHdR9D/GM0Kh05PZ7qmBpW9X9ZIs3OzU/Se2NOssGFtuIaEXMpVH9QCDEQdgKPiKR6hR/eQLwPNcKULRfbK1nPiyDUwdJst2KpFGIo8eFc1rU2nDN00JfG8SBuZ1oPTer6O3mBLDr51kLLLRZbuyUVlJR9PqjkgoJmWlAyexX3oi9+dElw1HIkfWN5FQ6yO94DhLfkU45nF3CUFd+9gOeS+ 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/23 21:27, 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. > > No functional changes. > > Signed-off-by: Qi Zheng I missed Suggested-by here, hi Kirill, can I add it? Suggested-by: Kirill Tkhai > --- > include/linux/memcontrol.h | 1 + > mm/vmscan.c | 29 ++++++++++++++++++----------- > 2 files changed, 19 insertions(+), 11 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..9f895ca6216c 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,16 @@ static int expand_one_shrinker_info(struct mem_cgroup *memcg, > if (!old) > return 0; > > + if (!need_expand(new_nr_max, old->map_nr_max)) > + return 0; > + > 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 +306,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,12 +314,6 @@ 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; > @@ -316,7 +322,7 @@ static int expand_shrinker_info(int new_id) > int old_map_size, old_defer_size = 0; > struct mem_cgroup *memcg; > > - if (!need_expand(new_nr_max)) > + if (!need_expand(new_nr_max, shrinker_nr_max)) > goto out; > > if (!root_mem_cgroup) > @@ -332,7 +338,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; > @@ -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