From: Sasha Levin Subject: [PATCH AUTOSEL 5.10 6/8] blk-cgroup: fix missing pd_online_fn() while activating policy Date: Tue, 24 Jan 2023 08:43:26 -0500 Message-ID: <20230124134328.637707-6-sashal@kernel.org> References: <20230124134328.637707-1-sashal@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674567821; bh=tfqkFwdSGSs2pUHF3ZMa11LzL7JgNr+nwO7nifF8Q1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MwOOYrGAL/g7qXNK6ohpTcHWwcovJo73KdHliwcl2VwEMkBgDG6TclnfnXlBIE056 4B5/TRwyE9BwyHv5R5RTl2QCnaoexf9ok5WZBqbKMmpMG8wOqj//PRWruvbIx9CSBl c9UmOEjm81mMgo1uutGE84T6JpmQhyi3HtarG1UtgegAtE1V9ymoaDXmV2rd/Yihds RVtvNIuqh57GuZSlZkCUNuQnqR9LhPbk4G4XnraMGjaED2zdi0HshblPigt43TZ1zQ /v46IngrpNK3STPV/5kDlT1hP7moHQW4D4Y3MQZxhFXhJiRqztzW/bGW2AhJF3yBEF 7BwvdwBTcYW+g== In-Reply-To: <20230124134328.637707-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Yu Kuai , Tejun Heo , Jens Axboe , Sasha Levin , josef-DigfWCa+lFGyeJad7bwFQA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org From: Yu Kuai [ Upstream commit e3ff8887e7db757360f97634e0d6f4b8e27a8c46 ] If the policy defines pd_online_fn(), it should be called after pd_init_fn(), like blkg_create(). Signed-off-by: Yu Kuai Acked-by: Tejun Heo Link: https://lore.kernel.org/r/20230103112833.2013432-1-yukuai1-XF6JlduFytWkHkcT6e4Xnw@public.gmane.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-cgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 484c6b2dd264..c623632c1cda 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1370,6 +1370,10 @@ int blkcg_activate_policy(struct request_queue *q, list_for_each_entry_reverse(blkg, &q->blkg_list, q_node) pol->pd_init_fn(blkg->pd[pol->plid]); + if (pol->pd_online_fn) + list_for_each_entry_reverse(blkg, &q->blkg_list, q_node) + pol->pd_online_fn(blkg->pd[pol->plid]); + __set_bit(pol->plid, q->blkcg_pols); ret = 0; -- 2.39.0