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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D1FA1C433E6 for ; Tue, 5 Jan 2021 22:59:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6570E22EBE for ; Tue, 5 Jan 2021 22:59:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6570E22EBE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C69278D00C0; Tue, 5 Jan 2021 17:59:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BEEDC8D006E; Tue, 5 Jan 2021 17:59:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F4468D00C0; Tue, 5 Jan 2021 17:59:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 802278D006E for ; Tue, 5 Jan 2021 17:59:01 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 4DA77824556B for ; Tue, 5 Jan 2021 22:59:01 +0000 (UTC) X-FDA: 77673238482.26.list73_0411d0d274dc Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 2912F1804B655 for ; Tue, 5 Jan 2021 22:59:01 +0000 (UTC) X-HE-Tag: list73_0411d0d274dc X-Filterd-Recvd-Size: 9763 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 22:59:00 +0000 (UTC) Received: by mail-pl1-f179.google.com with SMTP id j1so564353pld.3 for ; Tue, 05 Jan 2021 14:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9Hxeg7RM538QT73g2kaLdndzNoFfzbn1WB4hfWvSZK4=; b=B7L9o8WSEDCg28b6dQo9oNjLTAc+ey9QORavjdi37ElwceIs089tOeZhNPbTfOoWv9 LNtTm7EQ3XA9d5kKJva6hkUKh8X7zXlwM0zYKZ6ZnX5lbaLsOmJ4Vm/cuQqhm9c/p6cY THHqg5rTutu30CgXvo7FUoCU5zIVqGkmVsMUTJRCbVFVfwhTsweXHNViRPC6w3i0Oo5D ro8JlRNaU32srNHukt7o/gC3exzyxYnAlahTq8YDegUisrDtIN76vmyyGb4rUTMzNu65 rLdu/JKLWSKWxP0hF0EIZwtVR+wvuviF8CHwsyANaOJIcnb41P4XDLlSuAi66xABGrGa fy4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Hxeg7RM538QT73g2kaLdndzNoFfzbn1WB4hfWvSZK4=; b=sRJ76LOlVNyp8CRQuXZmC9wHpczlUBMVZhvh8+qdkEYq7pV9gAgC6dE+05pCPJZdDF /N9bA6kku/kNnjtMWJLaQsxcsHwTcRbuW8bQWuhhx4aXm983QRAKkXopqcvVsvhLy3v4 +kj2pveDRFezKD4z1pxesS0VBxUS2U0Mo4Zx/gl4UkhkEUv48YZMQtQHRD59ukoe1Gpr Olm5hEmpaO6u0yN+pNll7ALIRB480+9Ed8VKVJPk7hnaDzzExEH1D4nRHHK7QcB+4LK1 7oHHeBFQuYn6dPSR+iZab3WLXQnLFSPTmrxrv8PjosoqBIeDh0ooGcMKFPMOgMM6VMDC tQRw== X-Gm-Message-State: AOAM530GZptcwcuuHQmubaRpc4rUmdfDcv6wqONRjblR+Q5QrPdQDiIF ienWqDDz4Sud7GHoNn+abAI= X-Google-Smtp-Source: ABdhPJxYUessIt/pQ+7UpKjeoTntfiUMUxj7BrNvK+smRV683qkL3Jz2Ur82KlR9HuHc6FukDwo3Ew== X-Received: by 2002:a17:90b:1918:: with SMTP id mp24mr1310730pjb.45.1609887539671; Tue, 05 Jan 2021 14:58:59 -0800 (PST) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id fw12sm244233pjb.43.2021.01.05.14.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 14:58:58 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v3 PATCH 07/11] mm: vmscan: add per memcg shrinker nr_deferred Date: Tue, 5 Jan 2021 14:58:13 -0800 Message-Id: <20210105225817.1036378-8-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210105225817.1036378-1-shy828301@gmail.com> References: <20210105225817.1036378-1-shy828301@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: Currently the number of deferred objects are per shrinker, but some slabs= , for example, vfs inode/dentry cache are per memcg, this would result in poor isolation= among memcgs. The deferred objects typically are generated by __GFP_NOFS allocations, o= ne memcg with excessive __GFP_NOFS allocations may blow up deferred objects, then other= innocent memcgs may suffer from over shrink, excessive reclaim latency, etc. For example, two workloads run in memcgA and memcgB respectively, workloa= d in B is vfs heavy workload. Workload in A generates excessive deferred objects, then= B's vfs cache might be hit heavily (drop half of caches) by B's limit reclaim or global= reclaim. We observed this hit in our production environment which was running vfs = heavy workload shown as the below tracing log: <...>-409454 [016] .... 28286961.747146: mm_shrink_slab_start: super_cach= e_scan+0x0/0x1a0 ffff9a83046f3458: nid: 1 objects to shrink 3641681686040 gfp_flags GFP_HIGHUSER_MOVABLE|__G= FP_ZERO pgs_scanned 1 lru_pgs 15721 cache items 246404277 delta 31345 total_scan 123202138 <...>-409454 [022] .... 28287105.928018: mm_shrink_slab_end: super_cache_= scan+0x0/0x1a0 ffff9a83046f3458: nid: 1 unused scan count 3641681686040 new scan count 3641798379189 total= _scan 602 last shrinker return val 123186855 The vfs cache and page cache ration was 10:1 on this machine, and half of= caches were dropped. This also resulted in significant amount of page caches were dropped due = to inodes eviction. Make nr_deferred per memcg for memcg aware shrinkers would solve the unfa= irness and bring better isolation. When memcg is not enabled (!CONFIG_MEMCG or memcg disabled), the shrinker= 's nr_deferred would be used. And non memcg aware shrinkers use shrinker's nr_deferred = all the time. Signed-off-by: Yang Shi --- include/linux/memcontrol.h | 7 +++--- mm/vmscan.c | 49 +++++++++++++++++++++++++------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e05bbe8277cc..5599082df623 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -93,12 +93,13 @@ struct lruvec_stat { }; =20 /* - * Bitmap of shrinker::id corresponding to memcg-aware shrinkers, - * which have elements charged to this memcg. + * Bitmap and deferred work of shrinker::id corresponding to memcg-aware + * shrinkers, which have elements charged to this memcg. */ struct memcg_shrinker_info { struct rcu_head rcu; - unsigned long map[]; + unsigned long *map; + atomic_long_t *nr_deferred; }; =20 /* diff --git a/mm/vmscan.c b/mm/vmscan.c index 0033659abf9e..72259253e414 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -193,10 +193,12 @@ static void memcg_free_shrinker_info_rcu(struct rcu= _head *head) } =20 static int memcg_expand_one_shrinker_info(struct mem_cgroup *memcg, - int size, int old_size) + int m_size, int d_size, + int old_m_size, int old_d_size) { struct memcg_shrinker_info *new, *old; int nid; + int size =3D m_size + d_size; =20 for_each_node(nid) { old =3D rcu_dereference_protected( @@ -209,9 +211,18 @@ static int memcg_expand_one_shrinker_info(struct mem= _cgroup *memcg, if (!new) return -ENOMEM; =20 - /* Set all old bits, clear all new bits */ - memset(new->map, (int)0xff, old_size); - memset((void *)new->map + old_size, 0, size - old_size); + new->map =3D (unsigned long *)((unsigned long)new + sizeof(*new)); + new->nr_deferred =3D (atomic_long_t *)((unsigned long)new + + sizeof(*new) + m_size); + + /* map: set all old bits, clear all new bits */ + memset(new->map, (int)0xff, old_m_size); + memset((void *)new->map + old_m_size, 0, m_size - old_m_size); + /* nr_deferred: copy old values, clear all new values */ + memcpy((void *)new->nr_deferred, (void *)old->nr_deferred, + old_d_size); + memset((void *)new->nr_deferred + old_d_size, 0, + d_size - old_d_size); =20 rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, new); call_rcu(&old->rcu, memcg_free_shrinker_info_rcu); @@ -226,9 +237,6 @@ void memcg_free_shrinker_info(struct mem_cgroup *memc= g) struct memcg_shrinker_info *info; int nid; =20 - if (mem_cgroup_is_root(memcg)) - return; - for_each_node(nid) { pn =3D mem_cgroup_nodeinfo(memcg, nid); info =3D rcu_dereference_protected(pn->shrinker_info, true); @@ -242,12 +250,13 @@ int memcg_alloc_shrinker_info(struct mem_cgroup *me= mcg) { struct memcg_shrinker_info *info; int nid, size, ret =3D 0; - - if (mem_cgroup_is_root(memcg)) - return 0; + int m_size, d_size =3D 0; =20 down_read(&shrinker_rwsem); - size =3D DIV_ROUND_UP(shrinker_nr_max, BITS_PER_LONG) * sizeof(unsigned= long); + m_size =3D DIV_ROUND_UP(shrinker_nr_max, BITS_PER_LONG) * sizeof(unsign= ed long); + d_size =3D shrinker_nr_max * sizeof(atomic_long_t); + size =3D m_size + d_size; + for_each_node(nid) { info =3D kvzalloc(sizeof(*info) + size, GFP_KERNEL); if (!info) { @@ -255,6 +264,9 @@ int memcg_alloc_shrinker_info(struct mem_cgroup *memc= g) ret =3D -ENOMEM; break; } + info->map =3D (unsigned long *)((unsigned long)info + sizeof(*info)); + info->nr_deferred =3D (atomic_long_t *)((unsigned long)info + + sizeof(*info) + m_size); rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); } up_read(&shrinker_rwsem); @@ -265,10 +277,16 @@ int memcg_alloc_shrinker_info(struct mem_cgroup *me= mcg) static int memcg_expand_shrinker_info(int new_id) { int size, old_size, ret =3D 0; + int m_size, d_size =3D 0; + int old_m_size, old_d_size =3D 0; struct mem_cgroup *memcg; =20 - size =3D DIV_ROUND_UP(new_id + 1, BITS_PER_LONG) * sizeof(unsigned long= ); - old_size =3D DIV_ROUND_UP(shrinker_nr_max, BITS_PER_LONG) * sizeof(unsi= gned long); + m_size =3D DIV_ROUND_UP(new_id + 1, BITS_PER_LONG) * sizeof(unsigned lo= ng); + d_size =3D (new_id + 1) * sizeof(atomic_long_t); + size =3D m_size + d_size; + old_m_size =3D DIV_ROUND_UP(shrinker_nr_max, BITS_PER_LONG) * sizeof(un= signed long); + old_d_size =3D shrinker_nr_max * sizeof(atomic_long_t); + old_size =3D old_m_size + old_d_size; if (size <=3D old_size) return 0; =20 @@ -277,9 +295,8 @@ static int memcg_expand_shrinker_info(int new_id) =20 memcg =3D mem_cgroup_iter(NULL, NULL, NULL); do { - if (mem_cgroup_is_root(memcg)) - continue; - ret =3D memcg_expand_one_shrinker_info(memcg, size, old_size); + ret =3D memcg_expand_one_shrinker_info(memcg, m_size, d_size, + old_m_size, old_d_size); if (ret) { mem_cgroup_iter_break(NULL, memcg); goto out; --=20 2.26.2