From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B41F03955EA; Wed, 24 Jun 2026 06:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782283613; cv=none; b=mm1k4VFh7KLasTXbGfuOJ0QZz0OVclqkJnNJqRlazkJdbvwnoz5aaaNQCIv/I3kHBwxBpDN2xXHZ2B/3BDxEpd+FKKP30/S4Hlog41EjcmAl0h984FH4Y5HR3ZCd4RsDl4wQuEOHEjM9ryUObPjoLJb7i47Wfpf2uL3Xm88/jTc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782283613; c=relaxed/simple; bh=/Ir0nJeoylt70qoJtP0XcnKBijF9YDuvk20DSPkgma0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YoAjl9gjH7ZP3ud9Vh/hR/hqMUHXn1JZg6caGo3dx4lgAutHYvp+M6j6WE/W143Au3AS146gPhg9nzoS/ShfKcbvF+OflCXkkL+r6CZm2eTFsvTPNQwTnsR4buJgwhTw4fOgRWDJCBiqZdpBHhfWHIl98x8ny6Ly38JpEFepKZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZK1Pq3mD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZK1Pq3mD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C8321F00A3A; Wed, 24 Jun 2026 06:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782283612; bh=/jhyEzLhlRY3W/q9WunOA1TaDwZ+p7tN5yujXEUTAzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZK1Pq3mDY6kEI1rYWo5je+TQovD7OsaypfFpW/KIyKYUdCX1LTn9eRjIuyAEYNdqg 8fiJvOUvixBPjjCdzcpJzkroEWHIvDd6eIrucaOc0sZGieVWuPZdFMwz+9d22uDTud Fw0AOjVPBJgNrKoOIP3sP+rGw2LyaXEGkVAYQe6m17tT1yC6x7g2CxA6GDXAU1Jm5v ZFm3Zx8NYpDekEp5Xz7x5s0fTUxMOC6yht6+n6t8+AC5Ro7wzIpxUFv9SjfXvtVp5f 8Mq4PqAbDinicYyGxJ5s4KAE+kWnsqtJ0LZsq0SdOKCv/pdC7YeylnMb2GeNmcxWkZ 9U9Z+I9rw9c0w== From: Yu Kuai To: Tejun Heo , Josef Bacik , Jens Axboe Cc: Zheng Qixing , Christoph Hellwig , Tang Yizhou , Nilay Shroff , Ming Lei , cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] blk-cgroup: factor policy pd teardown loop into helper Date: Wed, 24 Jun 2026 14:46:25 +0800 Message-ID: <20260624064625.1743650-7-yukuai@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260624064625.1743650-1-yukuai@kernel.org> References: <20260624064625.1743650-1-yukuai@kernel.org> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zheng Qixing Move the teardown sequence which offlines and frees per-policy blkg_policy_data (pd) into a helper for readability. No functional change intended. Signed-off-by: Zheng Qixing Reviewed-by: Christoph Hellwig Reviewed-by: Tang Yizhou Signed-off-by: Yu Kuai --- block/blk-cgroup.c | 57 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 2538d8105e6c..e5e95be4fbc0 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1526,10 +1526,35 @@ struct cgroup_subsys io_cgrp_subsys = { .depends_on = 1 << memory_cgrp_id, #endif }; EXPORT_SYMBOL_GPL(io_cgrp_subsys); +/* + * Tear down per-blkg policy data for @pol on @q. + */ +static void blkcg_policy_teardown_pds(struct request_queue *q, + const struct blkcg_policy *pol) +{ + struct blkcg_gq *blkg; + + list_for_each_entry(blkg, &q->blkg_list, q_node) { + struct blkcg *blkcg = blkg->blkcg; + struct blkg_policy_data *pd; + + spin_lock(&blkcg->lock); + pd = blkg->pd[pol->plid]; + if (pd) { + if (pd->online && pol->pd_offline_fn) + pol->pd_offline_fn(pd); + pd->online = false; + pol->pd_free_fn(pd); + blkg->pd[pol->plid] = NULL; + } + spin_unlock(&blkcg->lock); + } +} + /** * blkcg_activate_policy - activate a blkcg policy on a gendisk * @disk: gendisk of interest * @pol: blkcg policy to activate * @@ -1641,25 +1666,11 @@ int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol) return ret; enomem: /* alloc failed, take down everything */ spin_lock_irq(&q->queue_lock); - list_for_each_entry(blkg, &q->blkg_list, q_node) { - struct blkcg *blkcg = blkg->blkcg; - struct blkg_policy_data *pd; - - spin_lock(&blkcg->lock); - pd = blkg->pd[pol->plid]; - if (pd) { - if (pd->online && pol->pd_offline_fn) - pol->pd_offline_fn(pd); - pd->online = false; - pol->pd_free_fn(pd); - blkg->pd[pol->plid] = NULL; - } - spin_unlock(&blkcg->lock); - } + blkcg_policy_teardown_pds(q, pol); spin_unlock_irq(&q->queue_lock); ret = -ENOMEM; goto out; } EXPORT_SYMBOL_GPL(blkcg_activate_policy); @@ -1674,11 +1685,10 @@ EXPORT_SYMBOL_GPL(blkcg_activate_policy); */ void blkcg_deactivate_policy(struct gendisk *disk, const struct blkcg_policy *pol) { struct request_queue *q = disk->queue; - struct blkcg_gq *blkg; unsigned int memflags; if (!blkcg_policy_enabled(q, pol)) return; @@ -1687,24 +1697,11 @@ void blkcg_deactivate_policy(struct gendisk *disk, mutex_lock(&q->blkcg_mutex); spin_lock_irq(&q->queue_lock); __clear_bit(pol->plid, q->blkcg_pols); - - list_for_each_entry(blkg, &q->blkg_list, q_node) { - struct blkcg *blkcg = blkg->blkcg; - - spin_lock(&blkcg->lock); - if (blkg->pd[pol->plid]) { - if (blkg->pd[pol->plid]->online && pol->pd_offline_fn) - pol->pd_offline_fn(blkg->pd[pol->plid]); - pol->pd_free_fn(blkg->pd[pol->plid]); - blkg->pd[pol->plid] = NULL; - } - spin_unlock(&blkcg->lock); - } - + blkcg_policy_teardown_pds(q, pol); spin_unlock_irq(&q->queue_lock); mutex_unlock(&q->blkcg_mutex); if (queue_is_mq(q)) blk_mq_unfreeze_queue(q, memflags); -- 2.51.0