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 D1315C47DDF for ; Fri, 26 Jan 2024 21:19:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 321716B0083; Fri, 26 Jan 2024 16:19:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D1B06B0087; Fri, 26 Jan 2024 16:19:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 199056B0088; Fri, 26 Jan 2024 16:19:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 08FE96B0083 for ; Fri, 26 Jan 2024 16:19:33 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D79B640747 for ; Fri, 26 Jan 2024 21:19:32 +0000 (UTC) X-FDA: 81722728584.20.06BC453 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf03.hostedemail.com (Postfix) with ESMTP id 31B0B2000F for ; Fri, 26 Jan 2024 21:19:30 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MetDwTFe; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 34iG0ZQkKCCsaQTLYJPLYNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tjmercier.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=34iG0ZQkKCCsaQTLYJPLYNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tjmercier.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706303971; 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:in-reply-to: references:dkim-signature; bh=SSSmPXy+o6tjb/tu3Cmmv9kAukC4V0XKiEOwf1LwTRI=; b=0TqtuBzJkzXPR21eYNlwEG/spdczLSWJpUK9eJUYu7KmbTS6w8R1uRX7bXoenQJA4+oKp6 6F51pmItgXC2/C0Okn4IQtxNWamxJdSuYBgxiR8WsrV3HJwzrusIyOMbQUaDIBLQ79yoei sgBPiuRq1HnNr2uFZ+idirGAdCI0+HM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MetDwTFe; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 34iG0ZQkKCCsaQTLYJPLYNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tjmercier.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=34iG0ZQkKCCsaQTLYJPLYNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tjmercier.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706303971; a=rsa-sha256; cv=none; b=hvhQM/GF2k658J2ZK2yrenUETi1FFyasxXQ41KmAiUoRalEaiq+qLuzBCRINodpjgjK+0a n2SUZx/0NuM8X1kdfCbeZppHrlSbdGFhNBl3E/K0BhSaxjtw92qyTb/xqpJn8NO52WDRbi BB98D8tNFGxss5/YN+BttKyGeClcxoI= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1d8a6d3627fso5642925ad.0 for ; Fri, 26 Jan 2024 13:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706303970; x=1706908770; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=SSSmPXy+o6tjb/tu3Cmmv9kAukC4V0XKiEOwf1LwTRI=; b=MetDwTFe87Q+iM1R7RoGdbGvrVjMGjjCtol4weBYbBNBeaVrbMEIUrR7NmAst8rzdk UxKuYCiG0JeQmVPW2/mT5net1VkASaWa2ZEWww1lPe77Ur7TPlEyR/e17lTQEBLi/Try f6qw+pq2D3vfsuJyb06hEA4LO1GwQxaHgZvNaqWxnvKRoBySM28HPY0U3pSK7xUBNzsu qUFxDr7ck1UtiYo8QK+5ailHJzcatzNF2ch8gze1USrXmCjEAtlGoD9WzpnbEnW/fY+e LrIF3tJDn6iLgV8IfbsFXDTs2LhAqrIe7iEyrMVoFSSfUUC94za96U7ocIQV2laYGAF+ ltog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706303970; x=1706908770; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SSSmPXy+o6tjb/tu3Cmmv9kAukC4V0XKiEOwf1LwTRI=; b=VWAZgB4UteivhOfzip9kVbS9TlzkJQxVsv1HpGpMbKXuBCrYdaKAJiGcw6uLXt5OpC rE9A6sE16NciEEKJZul5/ufXWSuXIe1MaGU56WSxUIXCaIaWELNkirJy5aP/NclNCK3l 9Fv17PR0TrbxkOZ0305TvUuSU1O2BKQaNsTLDpBFWAA8NBiQEdOisw5wdhTLbVXeCITB 2ZDpt+UMiLumdhnVyu6P4ho52MRN34bf6LkEiXuxLxEh9UyNJOUruLz8+w5sZBRKzleY jHKoBx6aJYd6GKvUr68yedITknQERNf5K1suVH0gps5yzucCbQ5DRU/ktjAY9DPSmmCd Z00Q== X-Gm-Message-State: AOJu0YxTgbgjiD8DN2JwN/ceT2MfJO/+dHQ2WbkPrqJI0vc1ZSWLCO95 uxZfXqT4vAnXcbWqWU9TWUU/AKAI+/qpAJhDVgXTLjsrCt2DUZ5AdqJvnHHW8mPx/KrSPNNQeRV mKxWKSckqIoET5Q== X-Google-Smtp-Source: AGHT+IGcJWdPGw8oLDxI59hFrmxzukTd0LWse+OHibEL8NCT4Uo50G49MeRK/UoAadCeD0k85qrwHAnVrXGgL4Y= X-Received: from tj-virt.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5683]) (user=tjmercier job=sendgmr) by 2002:a17:902:8218:b0:1d4:3238:37ce with SMTP id x24-20020a170902821800b001d4323837cemr10104pln.5.1706303970014; Fri, 26 Jan 2024 13:19:30 -0800 (PST) Date: Fri, 26 Jan 2024 21:19:25 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240126211927.1171338-1-tjmercier@google.com> Subject: [PATCH v2] mm: memcg: Don't periodically flush stats when memcg is disabled From: "T.J. Mercier" To: tjmercier@google.com, Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton Cc: android-mm@google.com, Minchan Kim , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Stat-Signature: iw4qi6t7x1r1u5ij1im6h1utwd7t37ei X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 31B0B2000F X-HE-Tag: 1706303970-954311 X-HE-Meta: U2FsdGVkX18wHLwCz3oeONDcYhvrIJMXauMU1o4nTlGrqSlgp9LlS4cHNRVa7vcVs3D044lDuc/VXlkUq8s16QVa2SACdoqpJSavM89QuOlwTipjlSO03YnOgNFrmfNMiPs9dnpjbRn2j90xWqRwCZHLfWi7lb0+s9rKM+TyfJiYCK0gS+Ii+y8Ak4yld7ml4hdoXpRKq6ADLQPL15EYcuooxcGCYcZKxTSPpYu7yA/+UgZJNiQR8ZBJH6RVxXbGBRAThgIXqxU1Ln/93uesePi7tTXh3aMRHGLQcEmZik/flmf6uvJshMSRddrkqCBoqpqbMiauHtgptNcnoatp4EB6NYM2wieChz6OMVTuGftRiqguoC0tZf0W7QDlEy8KtPCpBSXAH6Tc4HbQJQBfBLQUkSPjekVWCb+CxuEpisGW8sgvacc0vSORAAjCtuj3HXQFIz7KPWoIX3/PA/QrNZGMGWjxinkEVi/B0WYYACjjJ6X1kLjXl6lXgWdsRMXq0gkQQUtQSA0woJqLhCY9k+cujpbeWsaG8/uqsNEYZ7CbJTGLEiYFtFLVkGAaODrDcwkD7Ym3rL4ch5BwtIBi3mRzsPlxIaWzY3yH4RtAceTeWs+3tveVTBCmNhBv5Ibja4NMrtWr+cFSiia59KoCXXiHvuDg7a3pN1ezzbp9NHeTL0UAKtvQXCcI9uXd2LB8H9axoTu1w5aTQ1bfcAjEzsAOflYKx7hB1lpfVpAj7a7Myc3DKy6h/dymFJWsjI+BBy6B6dW0p+0MS5Fz7A8KgIStlj+HcSuMkVuY8oIbq5wLgpwhTJBR1pEyMC8jr5AbC1YlzswttzgA0HgQsGyaV1+02Xq5et5Vbda7Qa6q/WHiIV/s2EGW9c6Sy4HkXsshlA5sKdaW7niVFFRlLplRezm1xdboC1iAMfayZ0UmhZqWMXGFZnFF5BQ2bljfaSQ8pUGf/gkegfkc2BNWi/b Ojetib1w WSOjztemssf1Xk4gZeOfbLQWgP6hIieKT4bcS7TV3vTpFJ+SZwaq8z46cenwtsYJ+DVhVP3SxXCdbsd4y8T90o0ByYycXSGeSwi52mvO6lZreQP8AS3Lr6tsmv0PO6XCzop9Rayp1A4c0DVm2Mo47vnF6301Cxw9h0ef3cR6LeCSKkhAVoAHfRmchbP5VhfplRasqxvwrZaVo05ErrC3weAq6jJcYc9SqxyS89gZYA2xGgfCABsPrfiwloNfamO8pP5CC/vDJUIscFopCVCfNm6TvIieecBWWFbYtK9SfC2OMRdC37qylgXy2HXHPuOIi2+SLNv1HckMW4MmeUnqO5VPJeink/ZT93NZpT3fPH7VlW152c35pHudrMqOcDY/Y8dcmS9IH3AqnuG49JkbbLewAJJ7PbMuRg8pUQcsCe7XYpvcu/BztwC+PSsAazfn9zLZjLy5avz5xws3nVftUsaoZQAcmgwRi0qC+hIvXFfsWpzNzCUIjpWb2afIR6iK4B9fDQVKv1OgdcOUEdQ8jexVmmaUp1Yp1aqJmlkQdx013WhICIQ6mYY59KZ3qELWYK9oCFIMz86n8MWdhB6sRrFKRx6zTlNnIoaKQ/uAyG1v0rtIaTlcjllKKKhoE4TgI8rtm5BMw1XAdFrvr9Q5vYWMCHNPyrmVaefFnNaIVQvVYqy+X3fnKyZ9EQxfqFJ3Zzdp+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000025, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The root memcg is onlined even when memcg is disabled. When it's onlined a 2 second periodic stat flush is started, but no stat flushing is required when memcg is disabled because there can be no child memcgs. Most calls to flush memcg stats are avoided when memcg is disabled as a result of the mem_cgroup_disabled check added in 7d7ef0a4686a ("mm: memcg: restore subtree stats flushing"), but the periodic flushing started in mem_cgroup_css_online is not. Skip it. Fixes: aa48e47e3906 ("memcg: infrastructure to flush memcg stats") Reported-by: Minchan Kim Signed-off-by: T.J. Mercier Acked-by: Shakeel Butt Acked-by: Johannes Weiner --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e4c8735e7c85..bad8f9dfc9ab 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5586,7 +5586,7 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) if (alloc_shrinker_info(memcg)) goto offline_kmem; - if (unlikely(mem_cgroup_is_root(memcg))) + if (unlikely(mem_cgroup_is_root(memcg)) && !mem_cgroup_disabled()) queue_delayed_work(system_unbound_wq, &stats_flush_dwork, FLUSH_TIME); lru_gen_online_memcg(memcg); -- 2.43.0.429.g432eaa2c6b-goog