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 A4F36C433E0 for ; Wed, 3 Feb 2021 17:21:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 03BEC64DA5 for ; Wed, 3 Feb 2021 17:21:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03BEC64DA5 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 7F3E76B0074; Wed, 3 Feb 2021 12:21:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 77BAE6B0075; Wed, 3 Feb 2021 12:21:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6451F6B0078; Wed, 3 Feb 2021 12:21:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0089.hostedemail.com [216.40.44.89]) by kanga.kvack.org (Postfix) with ESMTP id 4F85D6B0074 for ; Wed, 3 Feb 2021 12:21:23 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id F2F2B181AC9C6 for ; Wed, 3 Feb 2021 17:21:22 +0000 (UTC) X-FDA: 77777622846.06.plant11_3210e60275d5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id B360D1003C318 for ; Wed, 3 Feb 2021 17:21:22 +0000 (UTC) X-HE-Tag: plant11_3210e60275d5 X-Filterd-Recvd-Size: 9400 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Wed, 3 Feb 2021 17:21:22 +0000 (UTC) Received: by mail-pg1-f181.google.com with SMTP id o63so185038pgo.6 for ; Wed, 03 Feb 2021 09:21:22 -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=J6v171T8udhMDGyBshwnSqs/Lfk2C4H0HVeOa7wJUcc=; b=Qwxsh2wrKevFmc2hiX6IlcrcssrpasIOnE5m67edh6AQz1mclxn2sKGTZLUcZ/9YZP 3LPLb9HscvMSn73XPYzZH/tHFeQsBEW4fiBAYoX3n+ayp95uhqBvdpno28pdeYtqkhfL 7ph1Nx90VwSE4x738JtXiQ7vpjBZeTPI6+EicF8Q0WtpxC4Nz/ycKuRM2nRol15Y2Tn1 helX0lJInJm7yilVAPsryMXn2w7EMLQRm1n2RGRJRyw/9Nfx7zM91a6ivAc6K7GqTUXk mMQ2XF8FFYrFusumPBPe59VRM/KqLoNxdxYkD+GIwgdhPtofwRajh12lAXvwB8oprwZP Hnuw== 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=J6v171T8udhMDGyBshwnSqs/Lfk2C4H0HVeOa7wJUcc=; b=mlS41kxzbbiiQesIhnmsp7uvJEWoGujhAQv6TSPwYbX5ch4MN0W5WinajPyvj/QLe2 e+jGGHrIvYvha1cRropTh6PG383MHJTeaPEsFKsqWaJnyCWBibrEw8RjLMLkLE4vwLXf aDw3J+R3CL7OHQTlnd9r3Y+OkiyvhaxR+O7pYqf3U1lRCyCTKQsJH8S7N6OUeR6IzSHM WEG080W/dOrgUROV3BgbWaqX0buaqgrn8Tr+LFJrxOCk8k6oxrTdhxO5Ko5KM53Ko4tz 8I0RaVqPRYhc+lnPCFoyrzOPHIwpKNqlOZ+onMR80Lq53nz+48308FiWw4gx8MuispoZ oPPA== X-Gm-Message-State: AOAM531wXEsJxB7s3yfhWDtMOubGDbQLWtyslO6IWZn7PWep0QGntlmO 11vhH9iGdsJS7UH6Cw5vX9OYVHZcDCVmlg== X-Google-Smtp-Source: ABdhPJyZ2yrggSL0vGz19HHhV8i3cZjX9S9HdYmi52Jd/Z/1q9XktcXrNgYsKj1YZ720SRjlGAkNOA== X-Received: by 2002:a62:4e0f:0:b029:1c0:d61e:8543 with SMTP id c15-20020a624e0f0000b02901c0d61e8543mr3906057pfb.77.1612372881473; Wed, 03 Feb 2021 09:21:21 -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 x21sm2368636pfn.100.2021.02.03.09.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 09:21:19 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz, 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: [v6 PATCH 07/11] mm: vmscan: add per memcg shrinker nr_deferred Date: Wed, 3 Feb 2021 09:20:38 -0800 Message-Id: <20210203172042.800474-8-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210203172042.800474-1-shy828301@gmail.com> References: <20210203172042.800474-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 | 45 ++++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 4c9253896e25..c457fc7bc631 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 shrinker_info { struct rcu_head rcu; - unsigned long map[]; + atomic_long_t *nr_deferred; + unsigned long *map; }; =20 /* diff --git a/mm/vmscan.c b/mm/vmscan.c index dc0d69e081b0..d9126f12890f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -196,10 +196,12 @@ static void free_shrinker_info_rcu(struct rcu_head = *head) } =20 static int 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 shrinker_info *new, *old; int nid; + int size =3D m_size + d_size; =20 for_each_node(nid) { old =3D rcu_dereference_protected( @@ -212,9 +214,15 @@ static int expand_one_shrinker_info(struct mem_cgrou= p *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->nr_deferred =3D (atomic_long_t *)(new + 1); + new->map =3D (void *)new->nr_deferred + d_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(new->nr_deferred, 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, free_shrinker_info_rcu); @@ -229,9 +237,6 @@ void free_shrinker_info(struct mem_cgroup *memcg) struct 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); @@ -244,12 +249,13 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) { struct 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_write(&shrinker_rwsem); - size =3D NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + m_size =3D NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + d_size =3D shrinker_nr_max * sizeof(atomic_long_t); + size =3D m_size + d_size; + for_each_node(nid) { info =3D kvzalloc_node(sizeof(*info) + size, GFP_KERNEL, nid); if (!info) { @@ -257,6 +263,8 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) ret =3D -ENOMEM; break; } + info->nr_deferred =3D (atomic_long_t *)(info + 1); + info->map =3D (void *)info->nr_deferred + d_size; rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); } up_write(&shrinker_rwsem); @@ -268,10 +276,16 @@ static int expand_shrinker_info(int new_id) { int size, old_size, ret =3D 0; int new_nr_max =3D new_id + 1; + int m_size, d_size =3D 0; + int old_m_size, old_d_size =3D 0; struct mem_cgroup *memcg; =20 - size =3D NR_MAX_TO_SHR_MAP_SIZE(new_nr_max); - old_size =3D NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + m_size =3D NR_MAX_TO_SHR_MAP_SIZE(new_nr_max); + d_size =3D new_nr_max * sizeof(atomic_long_t); + size =3D m_size + d_size; + old_m_size =3D NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + 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) goto out; =20 @@ -280,9 +294,8 @@ static int 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 expand_one_shrinker_info(memcg, size, old_size); + ret =3D 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