From patchwork Thu Aug 31 16:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13371727 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 A463FC83F35 for ; Thu, 31 Aug 2023 16:56:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 255AC8D001A; Thu, 31 Aug 2023 12:56:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 204D58D0001; Thu, 31 Aug 2023 12:56:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07E458D001A; Thu, 31 Aug 2023 12:56:22 -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 E8A7B8D0001 for ; Thu, 31 Aug 2023 12:56:21 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B392D4029C for ; Thu, 31 Aug 2023 16:56:21 +0000 (UTC) X-FDA: 81185002962.23.04A3B11 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf18.hostedemail.com (Postfix) with ESMTP id E96221C0033 for ; Thu, 31 Aug 2023 16:56:19 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=57Tt0ekS; spf=pass (imf18.hostedemail.com: domain of 3MsbwZAoKCK8ndhgnPWbTSVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3MsbwZAoKCK8ndhgnPWbTSVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693500980; a=rsa-sha256; cv=none; b=t+RztL8f/qTlL9JoC7F6V6Lc3mTOJKKZOiCWFHLuxhkKad6BmqRjAAH9qQCSES1hH8k/aJ YD84/ptQ3j7XPKmC6WA7D9A7v3678gt/6pymmYLdUflv5eA+wzwZmKntinT9/KvZzPDFZw R4BCWHKOR4KKgQmm7lz0pZWq9fNab5c= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=57Tt0ekS; spf=pass (imf18.hostedemail.com: domain of 3MsbwZAoKCK8ndhgnPWbTSVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3MsbwZAoKCK8ndhgnPWbTSVddVaT.RdbaXcjm-bbZkPRZ.dgV@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=1693500980; 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=rnl+F2n1kOs4P011p6EJFvzkt9Ylx9T9gDi6gAnNyhk=; b=4GvpNtU8SirkjcUe8D9Pd3/AROgG/g8f+1HWJ8Snr3qiISU4hMQCu+3IfNWTOLfqbA46ZG xapzQ5IsMBn8+wI0zt2JoJtqzYGw/X4LkuFkyLqmxgFfE1M6LJy8c3itR/Iw5y5JQ7Fi2H tJOVONEe1owCjBO/7pd1ouqTYZwYUQU= Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-68bf47ff13cso1182738b3a.1 for ; Thu, 31 Aug 2023 09:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693500979; x=1694105779; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rnl+F2n1kOs4P011p6EJFvzkt9Ylx9T9gDi6gAnNyhk=; b=57Tt0ekSFpbTNTkqbfDC4EYKBgTusUH/5M88a9hgGDbEIzgaSkkGOLyQilh7BR2Pfv AaOuKVJbSGU0JLWxYqSgnkvXk2lBJkOy8h3kDcVkD9fIuPIU68yWCAH9pHywrXbqOj6d lQTYmQaIpoziGNcaJ0hdr9KtxmxO4/9Uq1NnNeBG87eLl93jZSCCEE2a/CmsLuxZiBNr Axw8glAy7pHwc7+wuG2pd+Z07LWbSLH53TqujvBUa1P+K/6AMKpKBf6F048Msg36c9Rc XcraSECSOZrNmAeDTNmWlBZTubhrSyYsjrpe7gdE8ZyPK+FqnlTBL6RVycdN2JzdMMaD TpYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693500979; x=1694105779; 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=rnl+F2n1kOs4P011p6EJFvzkt9Ylx9T9gDi6gAnNyhk=; b=JcaCQ3SD3EFG3Na8YJgASRw8OynJQdsK2K5pYo8fnllU+zdM1PdsHYIwEwvEij34Yp kDakfXi83rktEhZPQeMDVkfcDN6Lndnwa4KQgeQZ3dOrFluLPdqg+tg7IeuBZoriNqjG Dlo23C2hM5XzZLJ5raVNAODfAABq+ukGbWTdU4f+Bj2VJ9l9GVvbDWrtNKNo66xWjw5+ aq0MmkuqtAnBe+zOzokv3IG0OswiNLlRcmgx0ivkp2jBOSUCkCK1OmBBIMaxk7NS9frZ ddWITiVhtoBBnsODdWyYbzQkOEhJ6y9gMfczKkv0o7qtrP3OQh3pw3UhYKnlwT/9vjDc PATg== X-Gm-Message-State: AOJu0YzQzoMg+kfGYvFla8/rjIE0BF/wRF21uDszXcJ3V+IZ3HZysWSu z6jtKlDDBhJHe98gpgYn4+dedmkdnm1mhvPW X-Google-Smtp-Source: AGHT+IGQaFV/eoJPD0E5YObQdt63kn1VXtZb+DnEHQpo8u+eLis24QVhJvy1qf6oTqJysoROPjRG5kn0lET0eVSr X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a05:6a00:2d87:b0:68b:dbbc:dd00 with SMTP id fb7-20020a056a002d8700b0068bdbbcdd00mr86084pfb.0.1693500978729; Thu, 31 Aug 2023 09:56:18 -0700 (PDT) Date: Thu, 31 Aug 2023 16:56:09 +0000 In-Reply-To: <20230831165611.2610118-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230831165611.2610118-1-yosryahmed@google.com> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog Message-ID: <20230831165611.2610118-3-yosryahmed@google.com> Subject: [PATCH v4 2/4] mm: memcg: add a helper for non-unified stats flushing From: Yosry Ahmed To: Andrew Morton Cc: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Ivan Babrou , Tejun Heo , " =?utf-8?q?Michal_Koutn=C3=BD?= " , Waiman Long , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E96221C0033 X-Stat-Signature: swnqctgox57t6a5aqydkuynh9p7idncu X-Rspam-User: X-HE-Tag: 1693500979-46266 X-HE-Meta: U2FsdGVkX1+1vdW08BwR424u9eDdlui1LLd0idUP0CPWDeDavlhTNn/YVxmrjPvpYYiSfbVF6FZ+HcNH/ZExP6t84iui0CWyo/FoijBL8KEVca/zURQlWbKcsNftFHltudzFHWtWyORvtOP+SePpGaIEsKqjDbPXY/XeCihRKceatRoi+krd7F0/duKwQN1UjHcIFsahZ8hhbFwTzTvINpXWVmTva6hiyGs5ofvP/mHiPC6b/k2Kbn04XB25ht2W1FRklzWI/OxR3GZfT2mkuv2g/GXhFcGLbvBywqpoK6zE2dQr+f5Ew0gxdinrxO6/Q6F+e+SvU5uPFJF30J2laAiGlHwL86GV/56W0dYLYAPQJ0hDRTUfLs1tvWv+LAjqfs/eQbnBRYeaselHHKWKFeuhn1qDvybCEhVoKuA/uOwoZ6Bc4hducBSluJnDkv5FCUs3NvO/QX+TWj4U2I/QTIGF8FrHs7jvgCh30tD/H5BnimC3UV0NKJah+jrH/GACHOI5Hi5n1u/8raUH/L/Qh50pTFuDil1FCvrJaOhJXbtrapTJFxO0EJVuUITl5XRiEw0nEL0Xm6gD/FZ5Jh1lNYGU8yf7fS9a0F0m7zjcj33vR0NRAFlqvhwEKi/50gfOfSzfY8YFKcVnx2GdbJ9ZM4aR4FXB1muSsqBiBHc9Bt11VZOBJ6ANOw8LXV23c02KUTLkFHyp0qaabn8emlI5GWEA9zusS4dm62S8z+viSLu/kUc4CI1QA1fzW95OPCWtrpOGp/lpH7NLaQeXJEMT1bIB+NpVeH4CNa6CjoVBsxJsjOxws9mDahaK3Z/yPdS8OcjidBkE01aV4BEz2PiVGR4ZY004ocqmzCgScsaXoVteNA5XnZijTQc/Vmaju7ZAuw48uioy/HK6PoOMMIZNSdvRmXnoFM44TZWhr9Mkp5JpDR0ztXEvOwSvNaCPvfKgJo1YRpT0zcTm6fdYg5e 1LEqYa5x 34oKb+sA/vxfF9psm3a7dgN3KRHOCGqGZPSB5HiUZxVv46fncGYkcAQBI3+oXxPntg8VVRZwGPiub6+Wy0bpSEPHvOCvkmbwI2Hdm8otjm7LD2aTFGTQ59CVVQlshfg5Q2WWqWRxYWWjcGJrdR/otQCKLuSnQ84THMdRvdsY1U2X4CRMPjo/fDBxcfYueRkbW6t5guqazGYAEut4M/Dqfg0PEw/K7tcbs6z9wqTkkUJPbaxEw7Vhi4PpSdykbU7AFWrFTXuBONgBKvh3HpThwooeMwxhOWsCA/XLqjBlWBS4GkiaGQ08TEteRk9dIqRaNR/ExGHebbYOwdvhyLfWO3oUY0lnjX8vbHNfHRZ1Q+ArqXzkI9+G6SOR9RzVdZTrCxZCudUALckZDBctEhF5tiF2H3kFna/rKshSG8ZevldFer/vENGKUh4l/OI2E8BYEUikNCETQ1DH8GTKZj0ZkdgteTlcHYmKdQXHfgho0R0TBA7+2+g0d+1Ei30VXTFAa7Fn4TytPZ3dvbMqhtlf/xvKEXzuc2RNg14lSRgzduG36z/AgAwb37r3HctV8rOODNyXwcqlPWLE8WGYsKvw6HHUuuar9QmTGE/mL04JO2tk5+yrjlKVKlzxJ7PUIp1+A2QZ0h24+svoTZ8AvAcYINhipk/KO9TfRoKJb 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: Some contexts flush memcg stats outside of unified flushing, directly using cgroup_rstat_flush(). Add a helper for non-unified flushing, a counterpart for do_unified_stats_flush(), and use it in those contexts, as well as in do_unified_stats_flush() itself. This abstracts the rstat API and makes it easy to introduce modifications to either unified or non-unified flushing functions without changing callers. No functional change intended. Signed-off-by: Yosry Ahmed Acked-by: Michal Hocko --- mm/memcontrol.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2d0ec828a1c4..8c046feeaae7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -639,6 +639,17 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) } } +/* + * do_stats_flush - do a flush of the memory cgroup statistics + * @memcg: memory cgroup to flush + * + * Only flushes the subtree of @memcg, does not skip under any conditions. + */ +static void do_stats_flush(struct mem_cgroup *memcg) +{ + cgroup_rstat_flush(memcg->css.cgroup); +} + /* * do_unified_stats_flush - do a unified flush of memory cgroup statistics * @@ -656,7 +667,7 @@ static void do_unified_stats_flush(void) WRITE_ONCE(flush_next_time, jiffies_64 + 2*FLUSH_TIME); - cgroup_rstat_flush(root_mem_cgroup->css.cgroup); + do_stats_flush(root_mem_cgroup); atomic_set(&stats_flush_threshold, 0); atomic_set(&stats_unified_flush_ongoing, 0); @@ -7790,7 +7801,7 @@ bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) break; } - cgroup_rstat_flush(memcg->css.cgroup); + do_stats_flush(memcg); pages = memcg_page_state(memcg, MEMCG_ZSWAP_B) / PAGE_SIZE; if (pages < max) continue; @@ -7855,8 +7866,10 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) static u64 zswap_current_read(struct cgroup_subsys_state *css, struct cftype *cft) { - cgroup_rstat_flush(css->cgroup); - return memcg_page_state(mem_cgroup_from_css(css), MEMCG_ZSWAP_B); + struct mem_cgroup *memcg = mem_cgroup_from_css(css); + + do_stats_flush(memcg); + return memcg_page_state(memcg, MEMCG_ZSWAP_B); } static int zswap_max_show(struct seq_file *m, void *v)