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 9F8A9C64EC7 for ; Sat, 25 Feb 2023 15:52:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 031B36B0071; Sat, 25 Feb 2023 10:52:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F23B76B0073; Sat, 25 Feb 2023 10:52:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E124E6B0074; Sat, 25 Feb 2023 10:52:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D2EC86B0071 for ; Sat, 25 Feb 2023 10:52:55 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 90939A02B1 for ; Sat, 25 Feb 2023 15:52:55 +0000 (UTC) X-FDA: 80506257510.07.F630680 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf05.hostedemail.com (Postfix) with ESMTP id 9F9AF100017 for ; Sat, 25 Feb 2023 15:52:52 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cEeozUG9; spf=pass (imf05.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.175 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=1677340373; 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=q04AbPP51Rsl9job/ihkWAhWSRrQZf0kGGWx77Ir7eM=; b=5J5e8hJLUBno/VkR8fLR6LT8SwIGm/PxkeRGQTGEkN7oVxjhNtXReppXcS6i8D0FM2/UAH c6wHMAY2AtZIdUuLMbxUc8ZJn5AGMB8MLlOYgp/mOGayXTYkg86CgKif+z/uBvwXH98PSP /dotQHyu/TbC5voojQ2uEHpARXM8A8c= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=cEeozUG9; spf=pass (imf05.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.175 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=1677340373; a=rsa-sha256; cv=none; b=z3ynyPNl0CSCW93qIQkZVli85SgDJMGHQ1H9HZP2rDHJwx8BhkWgQwoIPpxHl66bXrL+6w 8J26kGJZuc+9El9h/aPw8DaU60Ytowl1ccfalwTzFkIJvrEp/wIBFCF98ZcU+s6snDKcEz kF+o7zwN0ZjSEzCp0HNbohOUhNcB7A0= Received: by mail-pg1-f175.google.com with SMTP id bn17so1237331pgb.10 for ; Sat, 25 Feb 2023 07:52:52 -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=q04AbPP51Rsl9job/ihkWAhWSRrQZf0kGGWx77Ir7eM=; b=cEeozUG9t1phihonMzSqyCXSmUmXf57mMJ/MmuQlQDt6fLvaMO45hc/86KqfpMSFSV QBeVd04od3e45FJCSouPDlTqUYzo0L06spyuKRn/STGlgUeTl9oDSmXf/fZ3zPmC+xwu Q/rCnDxnJ+VxdiQ8dGzHTHXLwXuI9UFKKP6YUYlRpMivT4Dl/TJIhAisWayq+cN1AW4D AurhrGQCUYUctHFJGh4w9FVbz9/ExoSLIEhbqNEewhD79s5YLZdvellOQW/mUHHveNjv CZlMwn9AGSn9z8HiOaurkDp4odbqSlqTCVWJvIH1pXTeAAQOXtXtEHmxv1EpLmlvOuKr S1gA== 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=q04AbPP51Rsl9job/ihkWAhWSRrQZf0kGGWx77Ir7eM=; b=C6z8SYWxsHh3wCQKm63kDFtGlUcNt0FBjNWOgQg21zgHCERN03ultUoezShs20BOcy Wn2sCl+6f0mc64BAD7GJs47iuix1phLzNhies2CLy1SXESrII/OrBLItv+/M+kTum5fd hL7ISyXPPxR4sVGtp8kjJ1CBvZKaWLF7lSmN6lLXSAmINXPY8H02MbSTej6G39Y6EqoE iZOylt3lbmffjycCnPgGhGAkwi/IbRrNZohTLmLMCe0+XMjbHem3SKkrUhK951KXYwDF 2n713twnFVkBM8qIlWGF+8FwaEsfI+w6yAyJilAZbDg5KU2qkws/I5BwhotS/d/R0K26 /fBQ== X-Gm-Message-State: AO0yUKVctuweGKdDRCr4VufV0mKHeebe3qvnFcVjt8HzXsZvw8gP/q1Q BWvtgrlS2PrYGIp/vi4NI8ofMA== X-Google-Smtp-Source: AK7set8zjgY69RYdDMKhfW4edlqtGfmg3FJEQirkfw6heylGsW5/ZAndoHJ7FaBPGUnXupXsJaaAiw== X-Received: by 2002:aa7:874d:0:b0:5ef:8b7f:f69b with SMTP id g13-20020aa7874d000000b005ef8b7ff69bmr96607pfo.0.1677340371033; Sat, 25 Feb 2023 07:52:51 -0800 (PST) Received: from [10.200.9.56] ([139.177.225.248]) by smtp.gmail.com with ESMTPSA id b15-20020aa7810f000000b005b6f63c6cf4sm1375731pfi.30.2023.02.25.07.52.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 25 Feb 2023 07:52:50 -0800 (PST) Message-ID: Date: Sat, 25 Feb 2023 23:52:43 +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: Kirill Tkhai 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> <6f8f01b5-d802-db64-7725-8481c67c13a2@bytedance.com> From: Qi Zheng In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9F9AF100017 X-Stat-Signature: u9rfj3kyzbd4gembzi93khr6utj1ywfa X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677340372-175768 X-HE-Meta: U2FsdGVkX1+bXmmVGDPHIdhwxFT856cCfLPB9D/hj1utdpkOZUqCfYGwmgOzmRZrsFj0KLxbGbfKzfiKh7X32o+2IP+7cFEgXwKwXCdAer6t9lqZBHcb0qOLZin5Z0DXTFEAC4h1bbOHcPn3OuWDdIVo0KQw2xN5vUPI3SP0nQgrNY1ZBxfenhchuLKBRHY5wzDlGdM1UXQZCdORWTYibRV4GRMqawbuFr00fVf0RHr+CigRDiPp/gO0ARv4BM6u0ZZ5mJjlX9Yv8J0IDwnThSnr0sMbql4Ejf/EbcjddfjR1+gJviHRbAIJhdyufWc6xou4ssg2ZNf39yp5s46q23+CaSp593mxCUJ6l7hSBEvEDRHY6TRND2bbt7diw4A6ZpNMuEzOyCxDoniqtAFfe5QQzDz/H1lJJrNAKrfnTKMiNQA5tfYuacrqzgdq3+Y7sGdayAMP5YYy8RjcP+YycbQhhUb7HEFZ993uRGZXiC6B+T10TQ0+4VPxxQpLFSfujIqDStG/HXRdi8onH5LxHf5kTuLmMQAp9f+BBs4z6kDKiBllmdSuZPIqERLjhLFhMhYwKuciA+GFbKnxZ5r7UbIVQLfYlwyHeAoIAskDE7qqmc8Mxlt/WF3PzrJ8DjTfPxbks46EIPYssejkBkpG1wOc4VGZ1Vb7RPGA1cYvSYIITLHIFzf2evAJMRI+xbvYFdMgFyqUAu60uocfqdSxX0HmoyHk+ZMd1z+MwS1/YEy31CIPk3XthxfStlKZXVbzAMHdbyLxV9J7gPbI1Xeh518+E593z/5+f+ebU81UgPzdr2DtXF/T6a/vqLwetTrGAbvOPmH1XuHUdKcRKQuKO61LgfRc0ZNGkNWY6q0y0NJYkU6Ysn4ymAqShzh0rQ3JGLat498qo/vZNlm9koossfL3Mw1xr1atxWqq84l/vIm8/QrLMEv9Z0dt5jum0dja9hvheGaYoJz60KB/4VX CFwaVvjd YlTLHxf84OvqTmZ1ESBP4cqyhdT/iCawWao8lNjAaP2bOCrdkLkbQC/BS9dKdKxHxGngNbc9LQlpx9Bunl0C/sd2neBD6S1UKqs0Vb6m3PfpGdLCAVnwjITkZ6p1kwrpgjjGlu8AmkoimMBS36CtBDjeEe50b3/90hhxVFxJw4CXLj+ueqZnx0+mhbyXSfLOSE3CH+naEoN5DVoB6+JsfV6zRofJRJTNMsRq3V4BKZCXktTNneBIfZWbhVGYvVRHf5lOXJQkc44xz1WXmCz80dwFZhl+2fBG3ByqJebMTaFh2vSuDOx/w8K4MI/f6Bc3tVstZ/csFFQp9/vddeCxEAJimCuqZNAiUi4xTdcMkUdCMVo5RLz9wPpzDYbhPX55LMFT5b8rES08MvCbrs4JQwzIt984lHqO78PaVm61SZnNvtDSi4tnHhezZl+qRgFko3gPDKEoI/oA6Db4Yz0NFAXNRHuEpdcm5uxg1DfqvKj551VImq7JUISpXBiDRtMSB7uwvrX0lTAzhVW0Y9aW0Z7s+afF0QxDNAqAk 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/25 23:14, Kirill Tkhai wrote: > Hi Qi, > > On 25.02.2023 11:18, Qi Zheng wrote: >> >> >> 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 > > Yes, feel free to add this tag. Thanks. > > There is a comment below. > >>> --- >>>   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, > > The patch as whole thing won't work as expected. It won't ever call shrinker with ids from [round_down(shrinker_nr_max, sizeof(unsigned long)) + 1, shrinker_nr_max - 1] > > Just replay the sequence we add new shrinkers: > > 1)We add shrinker #0: > shrinker_nr_max = 0; > > prealloc_memcg_shrinker() > id = 0; > expand_shrinker_info(0) > new_nr_max = 1; > expand_one_shrinker_info(new_nr_max = 1) > new->map_nr_max = 1; > shrinker_nr_max = 1; > > 2)We add shrinker #1: > prealloc_memcg_shrinker() > id = 1; > expand_shrinker_info(1) > new_nr_max = 2; > need_expand(2, 1) => false => ignore expand > shrinker_nr_max = 2; > > 3)Then we call shrinker: > shrink_slab_memcg() > for_each_set_bit(i, info->map, 1/* info->map_nr_max */ ) { > } => ignore shrinker #1 Oh, I got it. > > I'd fixed this patch by something like the below: The fix below looks good to me, will add them to the next version. :) Thanks, Qi > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 9f895ca6216c..bb617a3871f1 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -224,12 +224,6 @@ 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, > @@ -247,9 +241,6 @@ 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; > @@ -317,14 +308,11 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) > 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, shrinker_nr_max)) > - goto out; > - > if (!root_mem_cgroup) > goto out; > > @@ -359,9 +347,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(); > } > } > > (I also added a new check into set_shrinker_bit() for safety). > > Kirill -- Thanks, Qi