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 9849EC77B73 for ; Wed, 24 May 2023 04:14:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D08B6B0074; Wed, 24 May 2023 00:14:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0819A6B0075; Wed, 24 May 2023 00:14:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8B65900002; Wed, 24 May 2023 00:14:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D92316B0074 for ; Wed, 24 May 2023 00:14:06 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 99A44140693 for ; Wed, 24 May 2023 04:14:06 +0000 (UTC) X-FDA: 80823830892.01.C2C9662 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by imf22.hostedemail.com (Postfix) with ESMTP id B459AC0011 for ; Wed, 24 May 2023 04:14:04 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=3j3ESLHr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684901644; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bWIUrbNjZ/giGjqNXvKfMr0d+ImmQ74l8qZeO+5oDSM=; b=XvQGMfAIGVm7NoSjpx25p/4rs2A6p9cTY43pAE/Wq/OaA3dNesETDBSEAKaSpOq1Ftnwew taQ3hr2j9/2fhe0cnj1rrt7ZaowY5RGiQv1a9ADEU9mVcYXpkI5WqnHegKprf051NSVfGi +nfX5PEke2si/uxlyb/gAYHdZxP05dk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=3j3ESLHr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf22.hostedemail.com: domain of yosryahmed@google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=yosryahmed@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684901644; a=rsa-sha256; cv=none; b=V96ITb+bvU7GqhlbCpI+5K22kt+SiIrFjjzxKNJ5IHQdM849QtKYNRmWqPyBG7Ceh5Btcs uu009S1bxCpmoC+NXiKh8dqlwPR/rTWT6S05OhfF8FhY09yLbaaGpE4/ifWmGqGeGlr/0R oPe1vuueVMRgS5GZ9Gu9CJ3di6U7iWc= Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-953343581a4so56759166b.3 for ; Tue, 23 May 2023 21:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684901643; x=1687493643; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bWIUrbNjZ/giGjqNXvKfMr0d+ImmQ74l8qZeO+5oDSM=; b=3j3ESLHry7Ffe13mvAiiUBSis++8oxlJ7+pij61hhoFogYzNOahpH3pLn5Cc188LjN a8D84jnFMzuvoMpxghJgnK+rr7RUe5shpfGNLP7p6+NcbVhArWH0A0FZXcmjfdklgyMI VQzcQLdKoV6PqQFFjiBSJIvcifJd3P6nQpZZvdVZv9eYCiRl6r0pg4iGjdt+wBkG4tZW 3UGvQi/LPEpWajkeJmukO8pUyT9sr24pZscxEV23hayUT1BWqX8nSk1VbuBlx6AiOrDv eGx+RY/NUSm2HpStTy3jpaVZMBIxNPfWwXbhfMDs1HWuggVyWW6GEMzossFG3ueolFDt D28w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684901643; x=1687493643; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bWIUrbNjZ/giGjqNXvKfMr0d+ImmQ74l8qZeO+5oDSM=; b=WcPGTjuG1QipGsYlH94YbDh+/ciqAtUJu1+H4cjQI9P2v/umqs+d+Nlr91AnvPgNLC t5lvIH6PYhwkJw2MrFTdSHqCsOstmOpnymqXnUcdZ9liXZ23X3RmFP6TcaRYgfvUcL2N DLs00tGbzzfgROLTXS5vGx+7x2W96/sJGUJge3ZekMbrvhjY9dfn430RtsZ72K1wjQVs hA2V7zEKPgXoRtI//RjBrnyD22lcDPPnNCWn9PIthtB2rzBuHII7CYOYkMT2bz3dI6jE xLSHCDNVM9uR6m42NORBwUFR4KK3lCzO1zOxi0zntrVwNgnR2D+B0xKOkG7pkgeLJjma n+8A== X-Gm-Message-State: AC+VfDyEqvJbalC4wSmnjhl/UFB3q3GPtHifEtcQJQNaz8QT1/TtzDNx rEXjKAufUmDsvHCQEXhcTLq/+k24pOSprayQUYUFcw== X-Google-Smtp-Source: ACHHUZ7A3Z/QBj5nHko9g8IciyizYYAW9bPoGUJJ3/V/khesJIszgOWvcy6LYvc1cfAeFhNmujQbv7GBdfe4Yw1kUzY= X-Received: by 2002:a17:907:d8a:b0:96f:baa4:cdba with SMTP id go10-20020a1709070d8a00b0096fbaa4cdbamr13738864ejc.33.1684901643153; Tue, 23 May 2023 21:14:03 -0700 (PDT) MIME-Version: 1.0 References: <20230524011935.719659-1-ming.lei@redhat.com> <11e81fc8-24db-54db-a518-b9bb67d0b504@redhat.com> In-Reply-To: <11e81fc8-24db-54db-a518-b9bb67d0b504@redhat.com> From: Yosry Ahmed Date: Tue, 23 May 2023 21:13:26 -0700 Message-ID: Subject: Re: [PATCH] blk-cgroup: Flush stats before releasing blkcg_gq To: Waiman Long Cc: Ming Lei , Linux-MM , Michal Hocko , Shakeel Butt , Johannes Weiner , Roman Gushchin , Muchun Song , Jens Axboe , linux-block@vger.kernel.org, cgroups@vger.kernel.org, Tejun Heo , mkoutny@suse.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: B459AC0011 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: dytgxcncq7563rjzhnkm11eqo1pgmms4 X-HE-Tag: 1684901644-263647 X-HE-Meta: U2FsdGVkX19AgzkVFmwlfd7SWnywqQXapIg24gtmk7NR31LSKp9WLMq59AfYCmuGKCsOxc+zg1M7+g6qEJQJUHE8KrnxPN6XFUQvNoajeDrBnMUOT165+NR+Q+2zLd46h099a3L+Vc+wRAAqINRcTPGKZdJuRtCuWoACakRjwBn7BWdJ5/q8mFPHnDePgnPrK5J0mP3uEf44cMzdhT/05pnLIL05qteKnaaZGlkpojPel/RwekMNwPdSgxSZ7TMkDC4AGX0SUsrbpCHaQbONksaUvwOw/05KyRhKqdwon77ZENQJ+NrpG0EyXH07d5bBeoFEJmDO2QrwWoyAXZS14c82arLVbQt4K1Oguy+92LlA1VMHAZm2VWEXpx7kHr0/j34qsQv7rfAB14IFfgTb0qZbmp0C6+nYeOjSslxbJCCJVTZhefEP5hRcC3fVFXsRv1gQMtCmjVfAJMgdXEU0hVI9N/5eCdn/Xt7vLbfXrqrWvJ+xcs7uinUdWLz+b7YV4b3ZaMcEEw8FQGfG3bV+mHAXpWhvPQCK3SRegGpbrdQVf/XjotVe137j8Oqsxl9fz6Sibf+HZBCURShLaYB58kcAeKK0ZZ8VvyLigqfplmuV1Gfpk0DFFO8p4YcEceBTSyEtXc1Xu0Wy7gOg5nvYkhMt2UUX7XoCLXfrJKPU7wfXH1ACKW+ZxS+PO7j5EqPyr9fINEFCwAUwaEoVQOhBflM8B1Neqbxr32tpRZg9xlGXqmkTOhpSmbznoaCk32vE33/UPC32MP3P4QBgZpGS/P7a27kdDkZB9Gg/ECLlNWAcCjhIFdTQI0LSoZF0QXa0Z5c+Zny3DHphbmGR8Vs3SX8FbjQbqDExmA+WbO3f/AGXEKJVqlzFuBaCOqooE67qEAzWs1vYWw2Y31SkGFIG0xe99UlSM6yMGb4Duo48PZdPySSvVPqKVDCG0MdGuEla4/dnWrIOzRsq08bYn2M VipJ9EyA ahyNoMDwFhrAX3WvJ6FlsxpWOxrScvTQJ3zDBOYyG/XkeEmtu1O1AnywrZVEKus7GhGouYGykbJe20+Z6Ys6J/w8P/KVOmLNoBDERKBYNLOSBoryN2Vk32BHGJRLKT+MWxgq0wN1X8K/4GKxzWuUfPghrCaZ7toVuZLTI4QLLLfAqmnCa+rgBMenaA8bc2AAfxpPkdbISsoRg76F+h4lLyTYqwfjTl8qHdWFEyXLpeE5otSefvD2oJtZlsm22EcR7Zvz2x8GDof9A5Qb1SXq7UPjRQ0oy5jf3MRneoOtAHQmxZ8WXmc1HCDjRCta2zhEeQhr1RzQCiWL5egeW+QUv8MxrfEokDiVq5+UZIE0Ly4t551b+WeHt3qbkANQQaC6HtMukQsQmFz4zWLkDihvoNoL3E34iHZzaLFLQ 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, May 23, 2023 at 9:04=E2=80=AFPM Waiman Long wr= ote: > > On 5/23/23 22:06, Yosry Ahmed wrote: > > Hi Ming, > > > > On Tue, May 23, 2023 at 6:21=E2=80=AFPM Ming Lei = wrote: > >> As noted by Michal, the blkg_iostat_set's in the lockless list > >> hold reference to blkg's to protect against their removal. Those > >> blkg's hold reference to blkcg. When a cgroup is being destroyed, > >> cgroup_rstat_flush() is only called at css_release_work_fn() which > >> is called when the blkcg reference count reaches 0. This circular > >> dependency will prevent blkcg and some blkgs from being freed after > >> they are made offline. > > I am not at all familiar with blkcg, but does calling > > cgroup_rstat_flush() in offline_css() fix the problem? or can items be > > added to the lockless list(s) after the blkcg is offlined? > > > >> It is less a problem if the cgroup to be destroyed also has other > >> controllers like memory that will call cgroup_rstat_flush() which will > >> clean up the reference count. If block is the only controller that use= s > >> rstat, these offline blkcg and blkgs may never be freed leaking more > >> and more memory over time. > >> > >> To prevent this potential memory leak: > >> > >> - a new cgroup_rstat_css_cpu_flush() function is added to flush stats = for > >> a given css and cpu. This new function will be called in __blkg_releas= e(). > >> > >> - don't grab bio->bi_blkg when adding the stats into blkcg's per-cpu > >> stat list, and this kind of handling is the most fragile part of > >> original patch > >> > >> Based on Waiman's patch: > >> > >> https://lore.kernel.org/linux-block/20221215033132.230023-3-longman@re= dhat.com/ > >> > >> Fixes: 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()") > >> Cc: Waiman Long > >> Cc: cgroups@vger.kernel.org > >> Cc: Tejun Heo > >> Cc: mkoutny@suse.com > >> Signed-off-by: Ming Lei > >> --- > >> block/blk-cgroup.c | 15 +++++++++++++-- > >> include/linux/cgroup.h | 1 + > >> kernel/cgroup/rstat.c | 18 ++++++++++++++++++ > >> 3 files changed, 32 insertions(+), 2 deletions(-) > >> > >> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c > >> index 0ce64dd73cfe..5437b6af3955 100644 > >> --- a/block/blk-cgroup.c > >> +++ b/block/blk-cgroup.c > >> @@ -163,10 +163,23 @@ static void blkg_free(struct blkcg_gq *blkg) > >> static void __blkg_release(struct rcu_head *rcu) > >> { > >> struct blkcg_gq *blkg =3D container_of(rcu, struct blkcg_gq, = rcu_head); > >> + struct blkcg *blkcg =3D blkg->blkcg; > >> + int cpu; > >> > >> #ifdef CONFIG_BLK_CGROUP_PUNT_BIO > >> WARN_ON(!bio_list_empty(&blkg->async_bios)); > >> #endif > >> + /* > >> + * Flush all the non-empty percpu lockless lists before releas= ing > >> + * us. Meantime no new bio can refer to this blkg any more giv= en > >> + * the refcnt is killed. > >> + */ > >> + for_each_possible_cpu(cpu) { > >> + struct llist_head *lhead =3D per_cpu_ptr(blkcg->lhead,= cpu); > >> + > >> + if (!llist_empty(lhead)) > >> + cgroup_rstat_css_cpu_flush(&blkcg->css, cpu); > >> + } > >> > >> /* release the blkcg and parent blkg refs this blkg has been = holding */ > >> css_put(&blkg->blkcg->css); > >> @@ -991,7 +1004,6 @@ static void blkcg_rstat_flush(struct cgroup_subsy= s_state *css, int cpu) > >> if (parent && parent->parent) > >> blkcg_iostat_update(parent, &blkg->iostat.cur= , > >> &blkg->iostat.last); > >> - percpu_ref_put(&blkg->refcnt); > >> } > >> > >> out: > >> @@ -2075,7 +2087,6 @@ void blk_cgroup_bio_start(struct bio *bio) > >> > >> llist_add(&bis->lnode, lhead); > >> WRITE_ONCE(bis->lqueued, true); > >> - percpu_ref_get(&bis->blkg->refcnt); > >> } > >> > >> u64_stats_update_end_irqrestore(&bis->sync, flags); > >> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h > >> index 885f5395fcd0..97d4764d8e6a 100644 > >> --- a/include/linux/cgroup.h > >> +++ b/include/linux/cgroup.h > >> @@ -695,6 +695,7 @@ void cgroup_rstat_flush(struct cgroup *cgrp); > >> void cgroup_rstat_flush_atomic(struct cgroup *cgrp); > >> void cgroup_rstat_flush_hold(struct cgroup *cgrp); > >> void cgroup_rstat_flush_release(void); > >> +void cgroup_rstat_css_cpu_flush(struct cgroup_subsys_state *css, int = cpu); > >> > >> /* > >> * Basic resource stats. > >> diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c > >> index 9c4c55228567..96e7a4e6da72 100644 > >> --- a/kernel/cgroup/rstat.c > >> +++ b/kernel/cgroup/rstat.c > >> @@ -281,6 +281,24 @@ void cgroup_rstat_flush_release(void) > >> spin_unlock_irq(&cgroup_rstat_lock); > >> } > >> > >> +/** > >> + * cgroup_rstat_css_cpu_flush - flush stats for the given css and cpu > >> + * @css: target css to be flush > >> + * @cpu: the cpu that holds the stats to be flush > >> + * > >> + * A lightweight rstat flush operation for a given css and cpu. > >> + * Only the cpu_lock is being held for mutual exclusion, the cgroup_r= stat_lock > >> + * isn't used. > > (Adding linux-mm and memcg maintainers) > > +Linux-MM +Michal Hocko +Shakeel Butt +Johannes Weiner +Roman Gushchin > > +Muchun Song > > > > I don't think flushing the stats without holding cgroup_rstat_lock is > > safe for memcg stats flushing. mem_cgroup_css_rstat_flush() modifies > > some non-percpu data (e.g. memcg->vmstats->state, > > memcg->vmstats->state_pending). > > > > Perhaps have this be a separate callback than css_rstat_flush() (e.g. > > css_rstat_flush_cpu() or something), so that it's clear what > > subsystems support this? In this case, only blkcg would implement this > > callback. > > That function is added to call blkcg_rstat_flush() only which flush the > stat in the blkcg and it should be safe. I agree that we should note > that in the comment to list the preconditions for calling it. I think it would be a better API if there's a separate callback for flushing only protected by percpu locks, that would be implemented by blkcg only in this case. Anyway, I see v2 dropped the cgroup changes anyway and is calling blkcg_rstat_flush() directly. > > Cheers, > Longman >