From patchwork Mon Aug 21 20:54:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13359806 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 1E0AFEE4996 for ; Mon, 21 Aug 2023 20:55:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9DCD940011; Mon, 21 Aug 2023 16:55:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A27138E0012; Mon, 21 Aug 2023 16:55:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C82A940011; Mon, 21 Aug 2023 16:55:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 757868E0012 for ; Mon, 21 Aug 2023 16:55:21 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 412814035E for ; Mon, 21 Aug 2023 20:55:21 +0000 (UTC) X-FDA: 81149317242.01.D11CCA1 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf30.hostedemail.com (Postfix) with ESMTP id 893AE8000D for ; Mon, 21 Aug 2023 20:55:19 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=gDjS77jh; spf=pass (imf30.hostedemail.com: domain of 3Ns_jZAoKCJEJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3Ns_jZAoKCJEJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@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=1692651319; 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:in-reply-to:references:references:dkim-signature; bh=wvdq61L+aFGdt8QKKpNnJHBdE39S0UeYM1yvvHjD3xQ=; b=C/z1nFpShr4RYyrCjosr8B/wnyM83Ms+uvFVyOa9lCNw+7toc/kdRlLoNoK2DiZLVBbDZ1 sGBDmzJBc39a/lD4yYC89I99I4q3br3HfW+WwHu1ZWvkbZsToBSBbaI4SEB82JsuhKzd8c YAUXa94+7O0caPUxH7gD7o5JPE2WxLo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692651319; a=rsa-sha256; cv=none; b=2FsdF/t3352k86RoAPSU3ZRfMMCucdeAE8FFh/aovYtoylgLnyM6Pln9lacukZTok6kou4 4N4gfsA00oCXbio36e0e4dMjdwpAdAObNOpAkgMIeeGPO8WhqFS/2UERFbKibSkMGlvoP8 /APPvNMq3iipyjjZujRLJKh6HnG6/1Y= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=gDjS77jh; spf=pass (imf30.hostedemail.com: domain of 3Ns_jZAoKCJEJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3Ns_jZAoKCJEJ9DCJv27zy19916z.x97638FI-775Gvx5.9C1@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-583c49018c6so55880657b3.0 for ; Mon, 21 Aug 2023 13:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692651318; x=1693256118; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wvdq61L+aFGdt8QKKpNnJHBdE39S0UeYM1yvvHjD3xQ=; b=gDjS77jh86r8ZKs1/zKg7Cco96sopZmFLEz/zj9xB/n1q5vx7rO/YHELKGS+X9Ug4U YpGS8y0oXx1+lQOuCRWO4hJaQzYd+MTroVbrUvtNf91m8TASXjyJIAiKKFjFs2SvbEMF ETcYXj5DRyAg6uMI1Tg+PNCmWCLVT4wh3IA7ElB0FC39nvwl0DxqHUQMVF3L6VZeLxWD Igvb6FKlgK7kbWdQtRC2tXSUf35syDuAtXUdPI50X7vL1Y+pprzowUj3JjDeaCVIeOGE KhQl4U7drhKa+h5IQMVK0nmZmAfMy/Kou0T2fowQemhM6iwR2fCYPTNirZnXMfkhAzuf 7vZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692651318; x=1693256118; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wvdq61L+aFGdt8QKKpNnJHBdE39S0UeYM1yvvHjD3xQ=; b=VQcQJ9TfEbuEMMSZ4S+cyCWV+w6WmIXo/HF7FtevcrjkuzxMYieOq6MtrNPHgqGfeT PhRxNYTeJBg4CWRz7NXsT2W+vx7fISIBXIoK8d8jYmGntriZlbGe6WRdf7cCG3nPLDhQ AR6pVbwLCZEktc8FFDwuQbH0w9Hcra5kkt2Cbu703V4NuG1zlBCyWhyAUyrUXPNiPubE pUmr/jSRxnIuRp6DzspqbbnS2FsoBKebMFUbY250S8CkUa1OeTPOrBMXNh/8LDTKuc/A R84+Kx1ZbDGUWc2UqllOmiWhzNvh3ImdAmDJAIpRLqeHY/gct2ptjSxyhPRCrPpRYhWU X9OA== X-Gm-Message-State: AOJu0YzNZv9Vsmk3B/P+r5eGDTUmZafuXdeOGm/HH3ShazMRJOKzk5Xy FXNttOAQ7mFuFIF5tdvqMkg5YcyhFXyG3wDX X-Google-Smtp-Source: AGHT+IHI17WgDLA9h5213qI/4QCn9pZF+BZYijIyegDPoTXjNDSTPJibwpZtlmJmIAbTjzp62J1FhYw7o02Y6LmV X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a25:d604:0:b0:cf9:3564:33cc with SMTP id n4-20020a25d604000000b00cf9356433ccmr61637ybg.13.1692651318564; Mon, 21 Aug 2023 13:55:18 -0700 (PDT) Date: Mon, 21 Aug 2023 20:54:56 +0000 In-Reply-To: <20230821205458.1764662-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230821205458.1764662-1-yosryahmed@google.com> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: <20230821205458.1764662-2-yosryahmed@google.com> Subject: [PATCH 1/3] mm: memcg: properly name and document unified stats flushing From: Yosry Ahmed To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Ivan Babrou , Tejun Heo , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed X-Rspamd-Queue-Id: 893AE8000D X-Rspam-User: X-Stat-Signature: rb4ddqsf586iqbf13chdwbwr116mm4ze X-Rspamd-Server: rspam03 X-HE-Tag: 1692651319-977381 X-HE-Meta: U2FsdGVkX18TyIkaMmtQxrX0v7CviUJejKRzT/uDPQVps88Zd3KTN92gzr/KN82iejXb//sBxhwUPIMgKwAjqx290YvqBXcCSPbfRKW+L9ZsuQj8mr36HGwR+MwFrWcWksDw0FSsfKlTVj61UEgRBCn4i6jgwtCTSIUelalKwDSv+bKghsYpBntP83sJA0p1plTo1u8t02doQKRMn5wuZ7gSMMuIHhPQrI/lSHoJot3RKum1RgOT/ko7sP6kEztb6dYf8NtWDkpWwoZjHhtLcVrl/XqJAwde+l5egikIVR4WyJIjRowp8i87v6uIPRrDeqUvL8bJuJPgkHMXZKWV9MfRRqbzWG8/zRbrd+K281vQomKlNP1GUiHcb0pKgPDREZvC0sfc1E6uCSgA4lBHVWnsgfcJreP5WcamYNiXtdTwqbodGtIAAlB0GEUH0hrTHRK+0MLyMT7wrJFZKjaHtCr8qu5ypjoJClrl9XfoP9mFYYZao4z0CBtbyzvyrl0YmIb+AjxQzJZVF1MW3wFQQ46+IlwVzR+RNeHnKCCekC+lg+OEbk/x/7RRT69GzIYUBYszjnZ+HdwxlO/Y5PPJkiWYGQvIK9lC9J7Nl3aibmOy7A9bA5XIhjxQ+wVjK81aqOphyyKDq0Sa4XAwTOrvnivtT5V35Wo0akhzZXlPXTDP910H5XcxdbHFBckDr7s9TcMf0OyuCd5HiA/WWJ9g/Cisnrf1Q74Nb8VUggJZXv6lGnmKpRhUNxt9LOr+/tcnSU4SBENsaFW63WncnO8e7puIV2ap6At4lNAv9bicuwXg6WRLGUaEifmVF/0zULerhJrjSj70yF9nPg6XitZpYY2TzahupzcTtmb4rQb+/cyE4Jd6zPHBTkVSGbkfUBAuhPYl3sDgAoPqA7VeEPrr7h2a7b0aBQTsiNqS6e92V5YXiBKXs8ppwrsri+O0pF7ywT1gMSpgtUgy7zHIoM7 0L5zSXE1 lcp0WTX2EObpQTt002B/B33nGcP0cFHiWt/zOQ9rm0KeTnY0t3SuXVfsml6XvH/Q3Y/TFS5HIsX/Z/CpehDugORGaTxXb+xF+YobkRsdpTNA8tajvA7+p/Czt/cyudME0t+tkU/nXhebwWRRmJ2U2b0LxK/aZFF0YdMxCrRJ1TM9U4r93NTO9sFHlfoxiz4t7XcPeRrbF7a7Ry1fq0FO5zWLIdjZQLPHOA55HYboELDEhG3Xgz/zFSygQGTz6eZMn6oF6v8Bn+nZYAKSfNj3lesT7gsynkT9Df2VJtjNX3JPcxFYsb0LsitNDQaDYwh1Pxr29EmXfJFVsTsJnStSd6fOAuNPYhY/aIto9YviMAEoUflAFmZUh94UMvi5ECig18Jrc3a9O3J+XvWdC3g3NrS5uek5UNOG82P0JkVh2j1qi85sPKYzKr4B/vz/hkdJKtNA+zDdJM2TxJGPIqa25c2MsvmOyWwn9EDvV/SmUEpVh9xUCSblEdroL6Cmz9kPtmbX7BfQxUynUxz9oRGn8rYM4ULB6Y1Q2WCpgulgbtqp2ZbIc0GXg88OroVFIluJhoR07xBpTSuQ2AMpo6kRbRzMr/8ijyTJgouHs5VVh1dTaH5YSe03WRCT2U4SD1qMcPXJHAftWnFqxj3g= 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: Most contexts that flush memcg stats use "unified" flushing, where basically all flushers attempt to flush the entire hierarchy, but only one flusher is allowed at a time, others skip flushing. This is needed because we need to flush the stats from paths such as reclaim or refaults, which may have high concurrency, especially on large systems. Serializing such performance-sensitive paths can introduce regressions, hence, unified flushing offers a tradeoff between stats staleness and the performance impact of flushing stats. Document this properly and explicitly by renaming the common flushing helper from do_flush_stats() to do_unified_stats_flush(), and adding documentation to describe unified flushing. Additionally, rename flushing APIs to add "try" in the name, which implies that flushing will not always happen. Also add proper documentation. No functional change intended. Signed-off-by: Yosry Ahmed --- include/linux/memcontrol.h | 8 +++--- mm/memcontrol.c | 53 ++++++++++++++++++++++++++------------ mm/vmscan.c | 2 +- mm/workingset.c | 4 +-- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 11810a2cfd2d..d517b0cc5221 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1034,8 +1034,8 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, return x; } -void mem_cgroup_flush_stats(void); -void mem_cgroup_flush_stats_ratelimited(void); +void mem_cgroup_try_flush_stats(void); +void mem_cgroup_try_flush_stats_ratelimited(void); void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, int val); @@ -1519,11 +1519,11 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, return node_page_state(lruvec_pgdat(lruvec), idx); } -static inline void mem_cgroup_flush_stats(void) +static inline void mem_cgroup_try_flush_stats(void) { } -static inline void mem_cgroup_flush_stats_ratelimited(void) +static inline void mem_cgroup_try_flush_stats_ratelimited(void) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index cf57fe9318d5..c6150ea54d48 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -630,7 +630,7 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) /* * If stats_flush_threshold exceeds the threshold * (>num_online_cpus()), cgroup stats update will be triggered - * in __mem_cgroup_flush_stats(). Increasing this var further + * in mem_cgroup_try_flush_stats(). Increasing this var further * is redundant and simply adds overhead in atomic update. */ if (atomic_read(&stats_flush_threshold) <= num_online_cpus()) @@ -639,13 +639,17 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) } } -static void do_flush_stats(void) +/* + * do_unified_stats_flush - do a unified flush of memory cgroup statistics + * + * A unified flush tries to flush the entire hierarchy, but skips if there is + * another ongoing flush. This is meant for flushers that may have a lot of + * concurrency (e.g. reclaim, refault, etc), and should not be serialized to + * avoid slowing down performance-sensitive paths. A unified flush may skip, and + * hence may yield stale stats. + */ +static void do_unified_stats_flush(void) { - /* - * We always flush the entire tree, so concurrent flushers can just - * skip. This avoids a thundering herd problem on the rstat global lock - * from memcg flushers (e.g. reclaim, refault, etc). - */ if (atomic_read(&stats_flush_ongoing) || atomic_xchg(&stats_flush_ongoing, 1)) return; @@ -658,16 +662,31 @@ static void do_flush_stats(void) atomic_set(&stats_flush_ongoing, 0); } -void mem_cgroup_flush_stats(void) +/* + * mem_cgroup_try_flush_stats - try to flush memory cgroup statistics + * + * Try to flush the stats of all memcgs that have stat updates since the last + * flush. We do not flush the stats if: + * - The magnitude of the pending updates is below a certain threshold. + * - There is another ongoing unified flush (see do_unified_stats_flush()). + * + * Hence, the stats may be stale, but ideally by less than FLUSH_TIME due to + * periodic flushing. + */ +void mem_cgroup_try_flush_stats(void) { if (atomic_read(&stats_flush_threshold) > num_online_cpus()) - do_flush_stats(); + do_unified_stats_flush(); } -void mem_cgroup_flush_stats_ratelimited(void) +/* + * Like mem_cgroup_try_flush_stats(), but only flushes if the periodic flusher + * is late. + */ +void mem_cgroup_try_flush_stats_ratelimited(void) { if (time_after64(jiffies_64, READ_ONCE(flush_next_time))) - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); } static void flush_memcg_stats_dwork(struct work_struct *w) @@ -676,7 +695,7 @@ static void flush_memcg_stats_dwork(struct work_struct *w) * Always flush here so that flushing in latency-sensitive paths is * as cheap as possible. */ - do_flush_stats(); + do_unified_stats_flush(); queue_delayed_work(system_unbound_wq, &stats_flush_dwork, FLUSH_TIME); } @@ -1576,7 +1595,7 @@ static void memcg_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) * * Current memory state: */ - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { u64 size; @@ -4018,7 +4037,7 @@ static int memcg_numa_stat_show(struct seq_file *m, void *v) int nid; struct mem_cgroup *memcg = mem_cgroup_from_seq(m); - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); for (stat = stats; stat < stats + ARRAY_SIZE(stats); stat++) { seq_printf(m, "%s=%lu", stat->name, @@ -4093,7 +4112,7 @@ static void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) BUILD_BUG_ON(ARRAY_SIZE(memcg1_stat_names) != ARRAY_SIZE(memcg1_stats)); - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { unsigned long nr; @@ -4595,7 +4614,7 @@ void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages, struct mem_cgroup *memcg = mem_cgroup_from_css(wb->memcg_css); struct mem_cgroup *parent; - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); *pdirty = memcg_page_state(memcg, NR_FILE_DIRTY); *pwriteback = memcg_page_state(memcg, NR_WRITEBACK); @@ -6610,7 +6629,7 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) int i; struct mem_cgroup *memcg = mem_cgroup_from_seq(m); - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { int nid; diff --git a/mm/vmscan.c b/mm/vmscan.c index c7c149cb8d66..457a18921fda 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2923,7 +2923,7 @@ static void prepare_scan_count(pg_data_t *pgdat, struct scan_control *sc) * Flush the memory cgroup stats, so that we read accurate per-memcg * lruvec stats for heuristics. */ - mem_cgroup_flush_stats(); + mem_cgroup_try_flush_stats(); /* * Determine the scan balance between anon and file LRUs. diff --git a/mm/workingset.c b/mm/workingset.c index da58a26d0d4d..affb8699e58d 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -520,7 +520,7 @@ void workingset_refault(struct folio *folio, void *shadow) } /* Flush stats (and potentially sleep) before holding RCU read lock */ - mem_cgroup_flush_stats_ratelimited(); + mem_cgroup_try_flush_stats_ratelimited(); rcu_read_lock(); @@ -664,7 +664,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, struct lruvec *lruvec; int i; - mem_cgroup_flush_stats(); + mem_cgroup_try_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,