From patchwork Wed Jan 27 23:33:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12051221 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 7912DC433DB for ; Wed, 27 Jan 2021 23:34:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2B59E64DCE for ; Wed, 27 Jan 2021 23:34:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B59E64DCE 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 A6A256B0075; Wed, 27 Jan 2021 18:34:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A1CD76B0078; Wed, 27 Jan 2021 18:34:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 909F26B007B; Wed, 27 Jan 2021 18:34:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 78B4E6B0075 for ; Wed, 27 Jan 2021 18:34:08 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 46BB11EF2 for ; Wed, 27 Jan 2021 23:34:08 +0000 (UTC) X-FDA: 77753160576.08.stew30_60067102759b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 2AE021819E785 for ; Wed, 27 Jan 2021 23:34:08 +0000 (UTC) X-HE-Tag: stew30_60067102759b X-Filterd-Recvd-Size: 9631 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 Jan 2021 23:34:07 +0000 (UTC) Received: by mail-pf1-f172.google.com with SMTP id e19so2475874pfh.6 for ; Wed, 27 Jan 2021 15:34:07 -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=WHXdiiNMkNIAWPj5jAlj2sLIoqe+YK5UhAhpnAub6bQ=; b=XUz/mnHzPZ0b2SdudDflQsr3JoDRs7VbyKkLSCfhQe6Atrj870akiuiHzicOsNC1U9 UrBgAr7ctO78waaNbPTTjYtO/Y8Z0G6602/tc57gp6rNAcjr/g0xOysF3OT++wD+FLVK GT8HXiGXyXbaHEeJ3YiAV7PDVhTGZJw6YEMNHGrBBJBEVygW+JAR+LjIw43nSH9/HgqX O7ND8PemQx7W+GKSITDGA/Mz1LdUQhNIM0Ir/zhGPBC+lNp7b3UPNGU6y4HA8iYg7431 TNxgTBVypR7vYY2z52W6ndgjsCDK7ojsUdeqkxNzltJcikR4QI1ruUq5VUl6Ks1KrX0c YFzw== 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=WHXdiiNMkNIAWPj5jAlj2sLIoqe+YK5UhAhpnAub6bQ=; b=h61Mx2y9RNgOZzHkB+4WCQ1sWB8ElLM2m7SvX2u0FXy/LIMBo78qH36IkyCkuBz99g 9/D1i4sYF+IDEV0Pu+mkLWOlVo6losCLebn1UI5zWGPIYqgkwiAmbk0zeaMltLPHG/ar EIVRVH40fsXRUovF1ffGJyHhJrdxvN7iYogMGeO+0/aFMVXMMo8CLZWoY030FVpNVjC2 aD2tsEAWGOdTu2S1NHn0r+PGINmIoMz3R4J+BDs2NJsbRMQFbAnR50ywIMSNuj4ABTRV 8wS5tGQ3EhKu/x/jBe7QR3Bmod0ra1le/xMxZRkeNQoCL+BVGQQnb577Tz/o85ZTGxkq a5VQ== X-Gm-Message-State: AOAM533dOc7Ck4FFhAs3j4d/otDa9n+OU1Fpx6vtSBJEfFN2/QUdIHB1 BEY8rDT1ezMyuPO8bo+8G3M= X-Google-Smtp-Source: ABdhPJxQDAc8sTA2KFNgfn9BXLtBZmKiY+DnypennfBAvw8iw98VGDS460FyGUPM2ksRCNKOBypLWQ== X-Received: by 2002:a63:1519:: with SMTP id v25mr13596877pgl.217.1611790446884; Wed, 27 Jan 2021 15:34:06 -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 124sm3498648pfd.59.2021.01.27.15.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 15:34:05 -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: [v5 PATCH 07/11] mm: vmscan: add per memcg shrinker nr_deferred Date: Wed, 27 Jan 2021 15:33:41 -0800 Message-Id: <20210127233345.339910-8-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210127233345.339910-1-shy828301@gmail.com> References: <20210127233345.339910-1-shy828301@gmail.com> MIME-Version: 1.0 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, one 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, workload 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_cache_scan+0x0/0x1a0 ffff9a83046f3458: nid: 1 objects to shrink 3641681686040 gfp_flags GFP_HIGHUSER_MOVABLE|__GFP_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 unfairness 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 | 48 +++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 62b888b88a5f..e0384367e07d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -93,12 +93,13 @@ struct lruvec_stat { }; /* - * 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[]; + unsigned long *map; + atomic_long_t *nr_deferred; }; /* diff --git a/mm/vmscan.c b/mm/vmscan.c index 256896d157d4..20be0db291fe 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -187,16 +187,21 @@ static DECLARE_RWSEM(shrinker_rwsem); #ifdef CONFIG_MEMCG static int shrinker_nr_max; +#define NR_MAX_TO_SHR_MAP_SIZE(nr_max) \ + ((nr_max / BITS_PER_LONG + 1) * sizeof(unsigned long)) + static void free_shrinker_info_rcu(struct rcu_head *head) { kvfree(container_of(head, struct shrinker_info, rcu)); } 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 = m_size + d_size; for_each_node(nid) { old = rcu_dereference_protected( @@ -209,9 +214,15 @@ static int expand_one_shrinker_info(struct mem_cgroup *memcg, if (!new) return -ENOMEM; - /* 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 = (unsigned long *)(new + 1); + new->nr_deferred = (void *)new->map + 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(new->nr_deferred, old->nr_deferred, old_d_size); + memset((void *)new->nr_deferred + old_d_size, 0, d_size - old_d_size); rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, new); call_rcu(&old->rcu, free_shrinker_info_rcu); @@ -226,9 +237,6 @@ void free_shrinker_info(struct mem_cgroup *memcg) struct shrinker_info *info; int nid; - if (mem_cgroup_is_root(memcg)) - return; - for_each_node(nid) { pn = mem_cgroup_nodeinfo(memcg, nid); info = rcu_dereference_protected(pn->shrinker_info, true); @@ -242,12 +250,13 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) { struct shrinker_info *info; int nid, size, ret = 0; - - if (mem_cgroup_is_root(memcg)) - return 0; + int m_size, d_size = 0; down_write(&shrinker_rwsem); - size = (shrinker_nr_max / BITS_PER_LONG + 1) * sizeof(unsigned long); + m_size = NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + d_size = shrinker_nr_max * sizeof(atomic_long_t); + size = m_size + d_size; + for_each_node(nid) { info = kvzalloc_node(sizeof(*info) + size, GFP_KERNEL, nid); if (!info) { @@ -255,6 +264,8 @@ int alloc_shrinker_info(struct mem_cgroup *memcg) ret = -ENOMEM; break; } + info->map = (unsigned long *)(info + 1); + info->nr_deferred = (void *)info->map + m_size; rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_info, info); } up_write(&shrinker_rwsem); @@ -266,10 +277,16 @@ static int expand_shrinker_info(int new_id) { int size, old_size, ret = 0; int new_nr_max = new_id + 1; + int m_size, d_size = 0; + int old_m_size, old_d_size = 0; struct mem_cgroup *memcg; - size = (new_nr_max / BITS_PER_LONG + 1) * sizeof(unsigned long); - old_size = (shrinker_nr_max / BITS_PER_LONG + 1) * sizeof(unsigned long); + m_size = NR_MAX_TO_SHR_MAP_SIZE(new_nr_max); + d_size = new_nr_max * sizeof(atomic_long_t); + size = m_size + d_size; + old_m_size = NR_MAX_TO_SHR_MAP_SIZE(shrinker_nr_max); + old_d_size = shrinker_nr_max * sizeof(atomic_long_t); + old_size = old_m_size + old_d_size; if (size <= old_size) goto out; @@ -278,9 +295,8 @@ static int expand_shrinker_info(int new_id) memcg = mem_cgroup_iter(NULL, NULL, NULL); do { - if (mem_cgroup_is_root(memcg)) - continue; - ret = expand_one_shrinker_info(memcg, size, old_size); + ret = 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;