From patchwork Wed Jul 26 15:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13328300 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 28F4CC001B0 for ; Wed, 26 Jul 2023 15:32:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC1096B0071; Wed, 26 Jul 2023 11:32:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A70D26B0072; Wed, 26 Jul 2023 11:32:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 911806B0074; Wed, 26 Jul 2023 11:32:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 74A236B0071 for ; Wed, 26 Jul 2023 11:32:30 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3828CB2977 for ; Wed, 26 Jul 2023 15:32:30 +0000 (UTC) X-FDA: 81054154860.19.FDB8EF5 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf27.hostedemail.com (Postfix) with ESMTP id 4940740029 for ; Wed, 26 Jul 2023 15:32:27 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hfmPlDHM; spf=pass (imf27.hostedemail.com: domain of 3ijzBZAoKCDUpfjipRYdVUXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3ijzBZAoKCDUpfjipRYdVUXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690385548; a=rsa-sha256; cv=none; b=vee7kO9LKcTLo87A4malAB25okMAkDJK9SSVD4ajnQOqi0FgS94d411HizjOaMqoYBICPs af0A++033bZ7rK1d5h2esSl6geSm/Qr97M9bLWYD5Lx8B586Bbh/PHRvYFWBPoo15FRGjw DydNpEZiSWJUFbbtW4WcngYBbpSFkrc= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=hfmPlDHM; spf=pass (imf27.hostedemail.com: domain of 3ijzBZAoKCDUpfjipRYdVUXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3ijzBZAoKCDUpfjipRYdVUXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690385548; 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=6e7KuyR5qZ6xCXotERLteVBuiZtk31A4XosqK7/beqs=; b=wxrHPhkMwt/jDyv6AFGTK9m7E/bBmQRQNdjlKq47sUyxEa2lcoForhMjGkHjAWqSLnSS2x I5qI0C1hs+y2MadJdhfADEvzEzV8WPwc1AojFQHPjpty0R9AMpUfwWfeQ9kGBcvIK8S8Ss fBFTgo1B95eO1KY1XSNV1G26JLzaJ4Y= Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-5635233876bso3597012a12.0 for ; Wed, 26 Jul 2023 08:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690385546; x=1690990346; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=6e7KuyR5qZ6xCXotERLteVBuiZtk31A4XosqK7/beqs=; b=hfmPlDHM//CdQxH+FNIMT9hQbrC5TE6d8oSs8Vv3mFiP4Yxwh7Xq1zE+ghsQM8ajLS olrZ91m4ZNbAzyVhUJhdPivUPF6QJQRQAayqxgM/FN2zEJid/T6tjet02urwcqQxVKF1 pCg+I6e+Ta528ZDcEtCTuCt6TiQlXHF0HP2YCupLkIaW60OXug/z+5yCXlDH2YCLILTA PUkeLHGe6j/IAncLqmGK1bNCU6UJ4OjkbCI4ofsyLm+1RTbDqmHfZec680qFCaCQj7om es60ZBquPQbMI1+MuI/U2OxUwsiZfBb73DZrgdsIzZP2dRli5JaZWa5K+FXgQMJU/qLp hJMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690385546; x=1690990346; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6e7KuyR5qZ6xCXotERLteVBuiZtk31A4XosqK7/beqs=; b=ifrg7wFwwOr4fRrUl29tRywQu/UFuQjPgAA4d2bOfP6A7aaSoPIXshcjJHp0TreHli reoXRqfufQudMQVAj0RmwGTOv6QPi24hIKk/cCloGVkh52XKo2844gesffxvwbbMp5xw SCzA+HQwxp5sId0St84QPTlwj2HGgM6F+5YV/VRBMdWl6vV09gVOPdlXn3K1604ohWUQ qKwxa/2MOFKToAux5BROw1JSGTROn49Kjag6wMtYzN1Z2Z2nR1Jjkxu5IvBHDOfrwE2h rEdbws830WkU9YW72UCz3/CKekZMo3Ef1gsX3U38QoABqGPviyhflFb1iUpekcQPoche Dvew== X-Gm-Message-State: ABy/qLab/C6d6kzuUzCY5wdfZd6DIHiFteDZAcUV3a0zd3hfufUMMdWj 1Qw+iKUIutlY1AZ6x3y4V0r1n55Knw8zDiiv X-Google-Smtp-Source: APBJJlEV1psb6hrUYzZ2qUbPMrxy2521kIy5mUO3uhqYVmcWuVNKPwnbr0Im3ZM2ll6UD7qKcSrZwb+nh29ttbHg X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a63:7f1c:0:b0:553:3ba2:f36 with SMTP id a28-20020a637f1c000000b005533ba20f36mr10273pgd.9.1690385546207; Wed, 26 Jul 2023 08:32:26 -0700 (PDT) Date: Wed, 26 Jul 2023 15:32:22 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230726153223.821757-1-yosryahmed@google.com> Subject: [PATCH] mm: memcg: use rstat for non-hierarchical stats From: Yosry Ahmed To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 4940740029 X-Stat-Signature: uxq41kucyoxsmzi3c1swfz1q6tres6ht X-Rspam-User: X-HE-Tag: 1690385547-148000 X-HE-Meta: U2FsdGVkX1/zaK08MM9mdYzyzdgjvmu2ubNh4FpbO7fJI6lihqyxfaN2TAdq1mFtxgKoHeLUTaRZh5Pv/e98MDRfNLlWy8Xs1alnentBJLziPDOH2EdtXzF/2LgUdzutc58c7gKH4STpOVzm2Wqdu5bKwq8mOuDaBacoOLp7+7H9ESfe8vf2K+FMessGVO/nnL38MfnLNC32Qpwl2tZYgNrw+n18Z+ru7PFPSzDsZ8342c88aE11Eu5YEQ/lskdmYuIJmIJ4hfIHzGecFPa/Bka0+PmlJDyJHxSl8y9nU5Qv+LIEI6UTh2iIALAAYvtlCRVTKJ7kf1o8eznotO/1eqA+yLJDcE0MDMBdctuhhaimrutHT/4QhWGFtWBcqCiIRg/m6S+zUxPwgZxe063RYK4kbs683Rw0Q3kiYu7gJZKi3vexgwydM6tzq54gpS9QWOFL7cSMrJoP/7F4qOziWSAwpGr1yB5BSlBMSF6UsbgWWLxMDF05ZJETeclLdaAhmLNRVbdH+EL5nBku8IkGWc/hDB0+Y5pbXa4oDQizAf/XjwBiwZlK9pVNzBr4yWfGb2iV3YohbFWGgOU5cJZ/EbnGWKxq575OWWdsrIMvCOfpFwR9TBj6c9m49zKJGQZ+Ta6I/wnIo69VQEejC7fEBcT2V3o60T+UzMVMeGIDu9/lW3jYbA7yM+O6eXfd/4AlxdrMflOlsREL1FS9bjn27ZmxWhJwrToGWv28t1laSqMbtg0G+TNdylJBaie/XgI9emC0HMJvNC7b9j/A1abfpiv/IDbitNWf6oSpArAAay7ZQ8n9cRt1NCBSbe1FVfZ5DXI1kRXVORylqN1yBf+Jea+W50XQt14NyHFlj8XMGKnwL4Cpg3J4Y8e4DkTW6gYGT/CrmzQxrpZnccG6CJj1D7S0MdqFNYVPgHkDlAo3j1LaWUMiB6Eiuc8d4g0rnTJKcPh+irbO/0UK1XSAl5b 9LXLUFIe FgOoIW86/lF+x/AlSOEqKVyTWGWlUZiKzW+soHC70OG2uaosnwHfVOSZFnSj/30EECoGwn6V/miaPkmXtahu+hbSFQorzq458CYDFy3t3gaqtDczB6czMi292g8x8Sjyok2kd5YEQl7sy6RW3VP/yA41YIU+mhNNOWw1Yx2c6h91BRcybYOmg0KnTxFpwU+Y7M+98OdZ5kmIlnfMGUavidnx9Y/MgepXX1AYmX2vNAJ/5z1gpASFGX/Sylu36bucdXC/uz06lW5CHpeN4yO8ZV24f9mb3loSuQ1fahuAc422udiVcbqHHxEe6utcK1PbfLP39iATK2CQcXy/yeLLr/yClFCV8zk4zhj56a5ZCYFD0Euuafvy/wxxPiuHxGe7EWPt54KVKTE53x3LkKgcck9kmpBS/zaDi1xVSInOKZ/8Zr1gty2/MZPeYthA26ie0hQZl2k2tbtRTDQO1yg4W2yKLwaDV+QScyokIvxiN4DfI91tuds6kX6l+plBEpQakPr6lCklIN1wIvsKybgEp3/zkHknI/PI//Y71AAPls8qqc3pU/nh/cvUhLq/sUaSHcxa/wnhfPrWUD/iMg4lqshyp9kWZw8MXyDt1bu+9ze0xkdAuFJDp7mg2B4urCRv1UiSHNspULPwioz0= 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, memcg uses rstat to maintain hierarchical stats. The rstat framework keeps track of which cgroups have updates on which cpus. For non-hierarchical stats, as memcg moved to rstat, they are no longer readily available as counters. Instead, the percpu counters for a given stat need to be summed to get the non-hierarchical stat value. This causes a performance regression when reading non-hierarchical stats on kernels where memcg moved to using rstat. This is especially visible when reading memory.stat on cgroup v1. There are also some code paths internal to the kernel that read such non-hierarchical stats. It is inefficient to iterate and sum counters in all cpus when the rstat framework knows exactly when a percpu counter has an update. Instead, maintain cpu-aggregated non-hierarchical counters for each stat. During an rstat flush, keep those updated as well. When reading non-hierarchical stats, we no longer need to iterate cpus, we just need to read the maintainer counters, similar to hierarchical stats. A caveat is that we now a stats flush before reading local/non-hierarchical stats through {memcg/lruvec}_page_state_local() or memcg_events_local(), where we previously only needed a flush to read hierarchical stats. Most contexts reading non-hierarchical stats are already doing a flush, add a flush to the only missing context in count_shadow_nodes(). With this patch, reading memory.stat from 1000 memcgs is 3x faster on a machine with 256 cpus on cgroup v1: # for i in $(seq 1000); do mkdir /sys/fs/cgroup/memory/cg$i; done # time cat /dev/cgroup/memory/cg*/memory.stat > /dev/null real 0m0.125s user 0m0.005s sys 0m0.120s After: real 0m0.032s user 0m0.005s sys 0m0.027s Signed-off-by: Yosry Ahmed --- include/linux/memcontrol.h | 7 ++++--- mm/memcontrol.c | 32 +++++++++++++++++++------------- mm/workingset.c | 1 + 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 5818af8eca5a..a9f2861a57a5 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -112,6 +112,9 @@ struct lruvec_stats { /* Aggregated (CPU and subtree) state */ long state[NR_VM_NODE_STAT_ITEMS]; + /* Non-hierarchical (CPU aggregated) state */ + long state_local[NR_VM_NODE_STAT_ITEMS]; + /* Pending child counts during tree propagation */ long state_pending[NR_VM_NODE_STAT_ITEMS]; }; @@ -1020,14 +1023,12 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, { struct mem_cgroup_per_node *pn; long x = 0; - int cpu; if (mem_cgroup_disabled()) return node_page_state(lruvec_pgdat(lruvec), idx); pn = container_of(lruvec, struct mem_cgroup_per_node, lruvec); - for_each_possible_cpu(cpu) - x += per_cpu(pn->lruvec_stats_percpu->state[idx], cpu); + x = READ_ONCE(pn->lruvec_stats.state_local[idx]); #ifdef CONFIG_SMP if (x < 0) x = 0; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e8ca4bdcb03c..90a22637818e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -742,6 +742,10 @@ struct memcg_vmstats { long state[MEMCG_NR_STAT]; unsigned long events[NR_MEMCG_EVENTS]; + /* Non-hierarchical (CPU aggregated) page state & events */ + long state_local[MEMCG_NR_STAT]; + unsigned long events_local[NR_MEMCG_EVENTS]; + /* Pending child counts during tree propagation */ long state_pending[MEMCG_NR_STAT]; unsigned long events_pending[NR_MEMCG_EVENTS]; @@ -775,11 +779,8 @@ void __mod_memcg_state(struct mem_cgroup *memcg, int idx, int val) /* idx can be of type enum memcg_stat_item or node_stat_item. */ static unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx) { - long x = 0; - int cpu; + long x = READ_ONCE(memcg->vmstats->state_local[idx]); - for_each_possible_cpu(cpu) - x += per_cpu(memcg->vmstats_percpu->state[idx], cpu); #ifdef CONFIG_SMP if (x < 0) x = 0; @@ -926,16 +927,12 @@ static unsigned long memcg_events(struct mem_cgroup *memcg, int event) static unsigned long memcg_events_local(struct mem_cgroup *memcg, int event) { - long x = 0; - int cpu; int index = memcg_events_index(event); if (index < 0) return 0; - for_each_possible_cpu(cpu) - x += per_cpu(memcg->vmstats_percpu->events[index], cpu); - return x; + return READ_ONCE(memcg->vmstats->events_local[index]); } static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, @@ -5526,7 +5523,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *parent = parent_mem_cgroup(memcg); struct memcg_vmstats_percpu *statc; - long delta, v; + long delta, delta_cpu, v; int i, nid; statc = per_cpu_ptr(memcg->vmstats_percpu, cpu); @@ -5542,9 +5539,11 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) memcg->vmstats->state_pending[i] = 0; /* Add CPU changes on this level since the last flush */ + delta_cpu = 0; v = READ_ONCE(statc->state[i]); if (v != statc->state_prev[i]) { - delta += v - statc->state_prev[i]; + delta_cpu = v - statc->state_prev[i]; + delta += delta_cpu; statc->state_prev[i] = v; } @@ -5553,6 +5552,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) /* Aggregate counts on this level and propagate upwards */ memcg->vmstats->state[i] += delta; + memcg->vmstats->state_local[i] += delta_cpu; if (parent) parent->vmstats->state_pending[i] += delta; } @@ -5562,9 +5562,11 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) if (delta) memcg->vmstats->events_pending[i] = 0; + delta_cpu = 0; v = READ_ONCE(statc->events[i]); if (v != statc->events_prev[i]) { - delta += v - statc->events_prev[i]; + delta_cpu = v - statc->events_prev[i]; + delta += delta_cpu; statc->events_prev[i] = v; } @@ -5572,6 +5574,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) continue; memcg->vmstats->events[i] += delta; + memcg->vmstats->events_local[i] += delta_cpu; if (parent) parent->vmstats->events_pending[i] += delta; } @@ -5591,9 +5594,11 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) if (delta) pn->lruvec_stats.state_pending[i] = 0; + delta_cpu = 0; v = READ_ONCE(lstatc->state[i]); if (v != lstatc->state_prev[i]) { - delta += v - lstatc->state_prev[i]; + delta_cpu = v - lstatc->state_prev[i]; + delta += delta_cpu; lstatc->state_prev[i] = v; } @@ -5601,6 +5606,7 @@ static void mem_cgroup_css_rstat_flush(struct cgroup_subsys_state *css, int cpu) continue; pn->lruvec_stats.state[i] += delta; + pn->lruvec_stats.state_local[i] += delta_cpu; if (ppn) ppn->lruvec_stats.state_pending[i] += delta; } diff --git a/mm/workingset.c b/mm/workingset.c index 4686ae363000..da58a26d0d4d 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -664,6 +664,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, struct lruvec *lruvec; int i; + mem_cgroup_flush_stats(); lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid)); for (pages = 0, i = 0; i < NR_LRU_LISTS; i++) pages += lruvec_page_state_local(lruvec,