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 D56EEC83F33 for ; Mon, 4 Sep 2023 14:45:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C8A88D0007; Mon, 4 Sep 2023 10:45:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 551E08D0001; Mon, 4 Sep 2023 10:45:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CB628D0007; Mon, 4 Sep 2023 10:45:19 -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 234BD8D0001 for ; Mon, 4 Sep 2023 10:45:19 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DA82EC074F for ; Mon, 4 Sep 2023 14:45:18 +0000 (UTC) X-FDA: 81199187916.10.6E570F8 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf27.hostedemail.com (Postfix) with ESMTP id F047B40012 for ; Mon, 4 Sep 2023 14:45:16 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=hnXnfiKk; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf27.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693838717; 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=vSixAjVtVtfBwEqUtETr7utTBGs453Bf8e7AyvXCIfg=; b=Egq1XZ993Pw55J9mNw2/teg+sitz6FHQXH08adz89C3IiCpR7VN23luPljT+RaEmldLU8W qBmLcCgaUwAFttYuuI1VC1fAUCpEm/Jbqw6A5o/E66pIz27mOek6iB4dCtkfRGgGjj8oJe Hz3eHZKGKW8m9nWo0PNgIIxheotDxyQ= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=hnXnfiKk; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf27.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693838717; a=rsa-sha256; cv=none; b=73zJdsB0guFqCdRrD+rM2/tdH+9OY6/ipBGqo0Q+073Iu0IW962HZ3/IxZ5dYdNfhTI52Y 48kNCQ2wiGRt0s6Efo6fQlh+/ncFJipKHm8f+2SffsKdm2weyO/y8oJf78QIlg09HCZbMQ aGoI4V7oLaMVcq1imduOYrMISu6L13c= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 297B11F74D; Mon, 4 Sep 2023 14:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1693838715; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vSixAjVtVtfBwEqUtETr7utTBGs453Bf8e7AyvXCIfg=; b=hnXnfiKkyovgWnaOElnC8H6D5iP+jTVvwybpfB2qyJcRyAQnX37i2H2bAOqzxktGv28NjF 96YNowWYuMT2KNQPWD80TK1qkpQ0HJEHQqtJOujInksPH5N+atrrezecobwiJvuS50Oa0o Q0hwb+MovOybiYKL20NWwduVbXq/2N4= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 08F3313425; Mon, 4 Sep 2023 14:45:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id PMPSOnrt9WSLNwAAMHmgww (envelope-from ); Mon, 04 Sep 2023 14:45:14 +0000 Date: Mon, 4 Sep 2023 16:45:14 +0200 From: Michal Hocko To: Yosry Ahmed Cc: Andrew Morton , Johannes Weiner , Roman Gushchin , Shakeel Butt , Muchun Song , Ivan Babrou , Tejun Heo , Michal =?iso-8859-1?Q?Koutn=FD?= , Waiman Long , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 2/4] mm: memcg: add a helper for non-unified stats flushing Message-ID: References: <20230831165611.2610118-1-yosryahmed@google.com> <20230831165611.2610118-3-yosryahmed@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230831165611.2610118-3-yosryahmed@google.com> X-Rspamd-Queue-Id: F047B40012 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: bpeexti8fyw7a1edseiu4njbbrkh8cq1 X-HE-Tag: 1693838716-602289 X-HE-Meta: U2FsdGVkX183/4DaDcu0L56BB/qYfL8VvgljnxGlgkiR7ZTYZeFbvHl/P+zm0DPUSAfeCSoJy3KJDdgorlvAFFgnU7SlyKMPzfo0ea0lKLgGkOb1VX8R5eQlTUFnhF9f3uAckj5NjFF8TZwz9AEtigNgj4f2qjUykhkQHhgGNh1sNxb+pD78PjgUk6X28my+aqzPUoW9OQRM6RdoLV5u5fr6Esg0q6NZJmVFPAW2E0MMcDz2xBoWzUFFeB2ERMtCEfE4OLMCXZ3+sZUm/C2yfGyQaRWdrreMr59CbY2m+BlAInUp8HbHswZ4DpIJhIskEHHDsIl1RvuQ1uBgyt6NzgM06dZzMC3By8U1iOPDXv1ESdI92+B5vwi7JcU1q/pidlhO3cPNiFtbVajQZQe191J2wlGkAIibQ3CnaJEMgJi4qwvEWgBXGjAQS55+0GpLFTffvdb6aSXjESD4xbOQFGiZ6cQz6sBRRghm9H4MbAfHOzCRCvWAxbrMyu5a3UefoDdxWsbij7CWRxoIQf1+Du6CkhohysLbvOHCaj88ARpRaE8OoHXIj7A4XV64YZZxZOfM2Q8/tS7zhRWPRKh0atvThDzbNgUa66GafitZdAqjyOkupkkmV3RsAaMNopen6gfo6UQW5McVUzMlTGHAH1IoUIZJ3xS715VdWGEMzEB6Bq1AurJSRV+SWHR05057dIdfpqV8ZdacGa79RonIozG182QMu1CczGrJB9nUL+DSDVMPvLO2GNPV/PQskzvz5BWt9b74Y+THIYAhL4vyfkwvjzI5k7NxzGRl5pC7llJGyQTpyPPjOQt1bX2rOymM3S35VTd1UX7enGEMupAx6PDncdCp6w6NuNGHS5HVGpT9NBhv1/xrssU7TOWJZTd8iDEwME3vmF+cUtF+TUVmCTJKr+yXgyrfFQyRLSOvb/T7XESILByhA0+7ih19sfDfrJ+9KmmvPUjt9Uc22uP 3MAzCIU2 kAQMdew617Hubeaa7hwgfRAHd+A6ohFQPkspO2AZzXgQ0H70NQHwOw4wm+JwyUn3HGO/cNyWaqoXWqTXbV8f9kWkpGwhnO1CyjOQ0Yn/be+2XwiuxshqbCWNXbDTA7ipepZnHqC7WG0/aBYn8IFXrpZ/jSK1KKUhLQ0sp604FsJlPKWqxMTNTCFDKVAxbjBtbxllkmX7+ALKjG2XBt+6l2iYZT5CkFIf2LleC2rZGpyTbCsU= 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: On Thu 31-08-23 16:56:09, Yosry Ahmed wrote: > 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) > -- > 2.42.0.rc2.253.gd59a3bf2b4-goog -- Michal Hocko SUSE Labs