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 01770C761AF for ; Wed, 29 Mar 2023 15:59:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F01B6B007B; Wed, 29 Mar 2023 11:59:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69FE76B007D; Wed, 29 Mar 2023 11:59:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 567D06B007E; Wed, 29 Mar 2023 11:59:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 441A86B007B for ; Wed, 29 Mar 2023 11:59:01 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D8BB1A06DF for ; Wed, 29 Mar 2023 15:59:00 +0000 (UTC) X-FDA: 80622394440.20.E6AF7D8 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf15.hostedemail.com (Postfix) with ESMTP id D16B5A0017 for ; Wed, 29 Mar 2023 15:58:58 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=Vl2TDvex; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf15.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 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=1680105539; 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=laCTMVv10tir+5LCK7bZIg6RxS0xYCgupvb50S/b4XY=; b=7yePywzIfxWOe9Viq0DYH6GUJYvXfM3vbdo2ifOUw/kS+BJ2noCFU1Pw+a5Im60Sp2k5Zf Q1Jek8KdapNEaz6EGZMDaV5X2j0s3cyz9SvLIJYm9v8/DtBpWdniuziGHEZuYgSZr7h+aO C9oxX5TW/WVQrG5TVME5NRzhAar13YA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=Vl2TDvex; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf15.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680105539; a=rsa-sha256; cv=none; b=8NF5ubKJ315EMajk2sbeu91e662pIGKNaZ3jyRNGbbZYL8ubbUM8j6ewY+V8djd03pWpqa GK+8EBXovNmBKERKT8vlFCAyDXULf1rnwBq+4UOzGZeLhyQVDAl0HRysJVvWHe/AwF4kxJ 8OJxQbO4j/ivZ0RKgh50kyKTg+vjqqs= 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-out1.suse.de (Postfix) with ESMTPS id 2CBDA219FB; Wed, 29 Mar 2023 15:58:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1680105537; 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=laCTMVv10tir+5LCK7bZIg6RxS0xYCgupvb50S/b4XY=; b=Vl2TDvex2fX+V/qOfl0Xk9vDM3ikifOzUk6sEr0WIzpohvYYkvFLW+6qBu+RlI035Az2QO Bg4vs8RqNGMdJ7g7ivHKAcgIhtsY1zKezQDQyUbKkOeL8fq/lKChGvk9VCPFR40TGr8YMU k0NaJphuGjbyfnmWQTPsdyb4/FmBbbU= 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 00BBA138FF; Wed, 29 Mar 2023 15:58:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qZMgAEFgJGQEaAAAMHmgww (envelope-from ); Wed, 29 Mar 2023 15:58:56 +0000 Date: Wed, 29 Mar 2023 17:58:56 +0200 From: Michal Hocko To: Yosry Ahmed Cc: Tejun Heo , Josef Bacik , Jens Axboe , Zefan Li , Johannes Weiner , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , Michal =?iso-8859-1?Q?Koutn=FD?= , Vasily Averin , cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, bpf@vger.kernel.org Subject: Re: [PATCH v2 5/9] memcg: replace stats_flush_lock with an atomic Message-ID: References: <20230328221644.803272-1-yosryahmed@google.com> <20230328221644.803272-6-yosryahmed@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230328221644.803272-6-yosryahmed@google.com> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D16B5A0017 X-Stat-Signature: 3mnadab1m4qsg1mj1gs77f3zud4yy3hk X-HE-Tag: 1680105538-888948 X-HE-Meta: U2FsdGVkX1+7ZiDk+MdmGWB0Q4e1ndim4nG7x308spEMM8GH2POfqbYYU217AIg0m42kZHG+cO6JH9e613YReFfUbLHUs1qVptqPxhd6/BLugQhkNwGt88WIxfRSIznK/gNQjC4dagUPlv3w9u+KiB3hLiRjo4oNzLvg8lmcC1+UNmCP6OXCe5+h58MK7bVkXbfOyzc42CnmPx0keTsDXk+9ff27bvHXbnXj6jJFyf7Nl6DdGmZJPLSmYe1N/eogvSwEQnDBVU0wWWIRxCPFyn9PQSvAcDGc6g1o92kyUSnrxdVaNrXWA3V68p4bBohOO9FKlvRKAlAZKVpP+GKpKsTnftXnltE3jak4USsmyPjFJUfUttLi+PXhGzYGZesmw2bQ1GIb5jJ/x2CEzAbEW/r3NNrZhbV4Fdb0RFTf5BqP61FmT0dqSVP3cVQRH1kh+4rV3SDAV6xXzb/VMaf7DdsfxPMieh+lIpaTMVgW93E6Po5WCJG+vCsBpjTWrspPQU/J3uHMxekS3xDwmZpxcJlILqReSTd1Yx+8XR2H8jBAnSrATBa+q162a14ZhYt+r60PkimCZ1UV5+WnGeHdVgdzo0TddCDJVnmwbHre+4StQFROa8rYTpSGZvvhkLa+eOuep8AwihY3YHTCY8H1AjBVloIfMxLotcqi8EB67VT9FTYqCS1AZ5MWLvNiABL1JM1udVYyUBBh+DzZRrrNdYSCb508uA5O1x7ASWGv85JqzOFgD+zvsdnvldzN6GqkMZh8yeUtd5FyIlM/z9dYogIRPE4elu5pDanVXoIWXSgmPFbbMTf1WkNWxv2OsowqDopC8DRH4U2tYZd49m2uLqHvdqOQhMgwCv3uwc/C2p3L0ELpadyyx6LvMQLTCmXD0rSgucgMpCLpeTaLjc+uLnLHifXwNkEiDEZ1FI9RSPpl6x+IRQDzIu/Li2w2yv4U85Fwvxb6Bir10AU5GrB Db/B1f0R aGHL7QzbC6PwcA4kmd2nxcFtymM4K3I9Ir9wtR4zCjIr35Chlf5ltxCvGKUQLl74+IxeoBoXwwG6gsCJbiMuu7c/0TKWU0WsrApf3hAz+NdjaAS9KUemJhvaaCf+JEzs9mkjyRf/PYSlSRS3gBM+fDoVN8WR4ayc003zU4EzgVB1bKc/pg4yJo8pik0YqwlN3bQ3BXcGzuVdIYaTPYJvD7TCbOFVz05GdIaXg6L8BXFkoV8aLeMzsUA+HAQUU06hIKmtUrnOHfjIKrny5YnhPYmATPg7RkABkj00O19S9ImG4Q3IqXOmSOzUC3snr/abHpDrM4bgTeOuR7/tZ2IHexZXu9vym1W0R2f/BxGMMUOxBHD2glCHmPTqchTKdsbiSt5vAwV7ufWtgRe4y3OVd3zEIp7jgsP0k0e5v 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 Tue 28-03-23 22:16:40, Yosry Ahmed wrote: > As Johannes notes in [1], stats_flush_lock is currently used to: > (a) Protect updated to stats_flush_threshold. > (b) Protect updates to flush_next_time. > (c) Serializes calls to cgroup_rstat_flush() based on those ratelimits. > > However: > > 1. stats_flush_threshold is already an atomic > > 2. flush_next_time is not atomic. The writer is locked, but the reader > is lockless. If the reader races with a flush, you could see this: > > if (time_after(jiffies, flush_next_time)) > spin_trylock() > flush_next_time = now + delay > flush() > spin_unlock() > spin_trylock() > flush_next_time = now + delay > flush() > spin_unlock() > > which means we already can get flushes at a higher frequency than > FLUSH_TIME during races. But it isn't really a problem. > > The reader could also see garbled partial updates, so it needs at > least READ_ONCE and WRITE_ONCE protection. Just a nit. Sounds more serious than it is actually. This would only happen if compiler decides to split the write. > 3. Serializing cgroup_rstat_flush() calls against the ratelimit > factors is currently broken because of the race in 2. But the race > is actually harmless, all we might get is the occasional earlier > flush. If there is no delta, the flush won't do much. And if there > is, the flush is justified. > > So the lock can be removed all together. However, the lock also served > the purpose of preventing a thundering herd problem for concurrent > flushers, see [2]. Use an atomic instead to serve the purpose of > unifying concurrent flushers. > > [1]https://lore.kernel.org/lkml/20230323172732.GE739026@cmpxchg.org/ > [2]https://lore.kernel.org/lkml/20210716212137.1391164-2-shakeelb@google.com/ > > Signed-off-by: Yosry Ahmed > Acked-by: Johannes Weiner Acked-by: Michal Hocko > --- > mm/memcontrol.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index ff39f78f962e..65750f8b8259 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -585,8 +585,8 @@ mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_node *mctz) > */ > static void flush_memcg_stats_dwork(struct work_struct *w); > static DECLARE_DEFERRABLE_WORK(stats_flush_dwork, flush_memcg_stats_dwork); > -static DEFINE_SPINLOCK(stats_flush_lock); > static DEFINE_PER_CPU(unsigned int, stats_updates); > +static atomic_t stats_flush_ongoing = ATOMIC_INIT(0); > static atomic_t stats_flush_threshold = ATOMIC_INIT(0); > static u64 flush_next_time; > > @@ -636,15 +636,19 @@ static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > > static void __mem_cgroup_flush_stats(void) > { > - unsigned long flag; > - > - if (!spin_trylock_irqsave(&stats_flush_lock, flag)) > + /* > + * 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; > > - flush_next_time = jiffies_64 + 2*FLUSH_TIME; > + WRITE_ONCE(flush_next_time, jiffies_64 + 2*FLUSH_TIME); > cgroup_rstat_flush_atomic(root_mem_cgroup->css.cgroup); > atomic_set(&stats_flush_threshold, 0); > - spin_unlock_irqrestore(&stats_flush_lock, flag); > + atomic_set(&stats_flush_ongoing, 0); > } > > void mem_cgroup_flush_stats(void) > @@ -655,7 +659,7 @@ void mem_cgroup_flush_stats(void) > > void mem_cgroup_flush_stats_ratelimited(void) > { > - if (time_after64(jiffies_64, flush_next_time)) > + if (time_after64(jiffies_64, READ_ONCE(flush_next_time))) > mem_cgroup_flush_stats(); > } > > -- > 2.40.0.348.gf938b09366-goog -- Michal Hocko SUSE Labs