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 A5A8FC433E0 for ; Tue, 9 Feb 2021 17:47:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 32D1264E37 for ; Tue, 9 Feb 2021 17:47:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32D1264E37 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 BB7946B0074; Tue, 9 Feb 2021 12:47:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B679C6B0075; Tue, 9 Feb 2021 12:47:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A309C8D0001; Tue, 9 Feb 2021 12:47:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 8A1666B0074 for ; Tue, 9 Feb 2021 12:47:35 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 57B7B824556B for ; Tue, 9 Feb 2021 17:47:35 +0000 (UTC) X-FDA: 77799461670.20.stone51_1e176da27609 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 68FA118294F12 for ; Tue, 9 Feb 2021 17:47:23 +0000 (UTC) X-HE-Tag: stone51_1e176da27609 X-Filterd-Recvd-Size: 9840 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 17:47:22 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id lw17so1816273pjb.0 for ; Tue, 09 Feb 2021 09:47: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=Kvzc/fCpMbH2LLBrDe6dDllXNRKftSCiNU4YaBKuDgQ=; b=NI1m2W7cVpizXt/YOZ3aDRsQVWr4IYX5p9aD6+6+XgUoIYzb6GW6FioLXQ05nlLODN m4SgoGE924CgLaMOXVFTEv8jqYxyK763M3IambPUZEIzZ/whMXhcOBYwotyFA42Ato5s gxWXCs/rEq5fLXZpphOmpMor+mo1J++/G2OT/9MtNAaGHEDRUXXXxEHYg9EdyppMpfgL Nj5Z9QLYxsA8Q+41bU1QIPsT1vn28e97Namh2dh/auEu/Z9K6zgNWo/MW8x0LCO+XMbv 0M6qz6IOpYlTXWVjRmtbx5ee29GEjPpMnFWF9nKAfotl55jUVnbDAOShYJ1pml5Ik2H8 e/6w== 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=Kvzc/fCpMbH2LLBrDe6dDllXNRKftSCiNU4YaBKuDgQ=; b=ft8l1QYeNREvI9WPUybdQNZMOBv/AWMzHcb8cj2ocpFhowQoK3YCnuyc9N6vrqJnP9 HFPAg25051tR7l629DCDuMQzD7pZA5wGUfx0KE0YtlhJXMnen9bSAyWAl0bjYgbVyN29 La6MANb4hNpqCPb+uJJfPbicpguSZ6GhOdfthot7PN5AT7jkEdEiCbERPkl0fDXMVllQ ZaygZLnUgtAZugOBsuFB9aZKuyejIXPCjv4Do1kFZCG7zmzf8W2RUXa4YdUGFpuG2MFo /93PY1BW9OttvUhM68FLA1y7eOJBEWHV1+5kaDAWJX2i2PbEUZx2JERRDv57Ffqm0RnN w4ig== X-Gm-Message-State: AOAM532TfSxAoTs6Tet5GsL359Ure9KQw4/t2CrlJ4zXlLe2sNuQdlJS RuD3JzrGMKkvvR0nWZ1lFQo= X-Google-Smtp-Source: ABdhPJzihVj/26Ztz6MC1D4xaprmi29GfhKEOFTBPgwhSVN8uJmhzX5xRx6MPxMnkXCcAFzo5Meb8w== X-Received: by 2002:a17:90a:3e01:: with SMTP id j1mr5093096pjc.138.1612892842219; Tue, 09 Feb 2021 09:47:22 -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 j1sm22260929pfr.78.2021.02.09.09.47.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 09:47:21 -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: [v7 PATCH 08/12] mm: vmscan: add per memcg shrinker nr_deferred Date: Tue, 9 Feb 2021 09:46:42 -0800 Message-Id: <20210209174646.1310591-9-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210209174646.1310591-1-shy828301@gmail.com> References: <20210209174646.1310591-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 ratio 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 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 a047980536cf..d4b030a0b2a9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -187,9 +187,13 @@ static DECLARE_RWSEM(shrinker_rwsem); #ifdef CONFIG_MEMCG static int shrinker_nr_max; =20 +/* The shrinker_info is expanded in a batch of BITS_PER_LONG */ #define NR_MAX_TO_SHR_MAP_SIZE(nr_max) \ (DIV_ROUND_UP(nr_max, BITS_PER_LONG) * sizeof(unsigned long)) =20 +#define NR_MAX_TO_SHR_DEF_SIZE(nr_max) \ + (round_up(nr_max, BITS_PER_LONG) * sizeof(atomic_long_t)) + static struct shrinker_info *shrinker_info_protected(struct mem_cgroup *= memcg, int nid) { @@ -203,10 +207,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 shrinker_info_protected(memcg, nid); @@ -218,9 +224,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); @@ -235,9 +247,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 shrinker_info_protected(memcg, nid); @@ -250,12 +259,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 NR_MAX_TO_SHR_DEF_SIZE(shrinker_nr_max); + size =3D m_size + d_size; + for_each_node(nid) { info =3D kvzalloc_node(sizeof(*info) + size, GFP_KERNEL, nid); if (!info) { @@ -263,6 +273,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); @@ -274,10 +286,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 NR_MAX_TO_SHR_DEF_SIZE(new_nr_max); + size =3D m_size + d_size; + old_m_size =3D NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + old_d_size =3D NR_MAX_TO_SHR_DEF_SIZE(shrinker_nr_max); + old_size =3D old_m_size + old_d_size; if (size <=3D old_size) goto out; =20 @@ -286,9 +304,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