From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 80B8654BFE; Tue, 14 May 2024 11:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685340; cv=none; b=eVuPSRTcH+STufBiiayUaGhMOPK/Js6gdrkU2kTLD27riQ9JihhAltgli3XHYqLc0Gn4GY5bV2AFq08e20pf7KWn72ZsusznX32aGobMCq3nEXam0qHVrzbu3aJfFQ5/6N8U3HSTzz92jyD3CnVzu557dY2UKc3lsqALlytmAOM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685340; c=relaxed/simple; bh=DqY1oSmx3Ja7UajFq61UR1ouPaeUPXDRlpPUJOmgvtE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u1PFkNoeSNeO8z17BCaKmOCET3sWKhGkdIVSAiZa3iEJ5QVNIhlFLuw+444VquLFUXrzZ0MfFUckdXHmYK7b9fVAs9mEws2+A3QBEXtdv15JCZ3IDT+NFIIUZBx8nU8rPUJaYzHZrYjzejhDvV/tA+YkJ+1QsTogg/n3JMQyUqE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=f/ubUAly; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f/ubUAly" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E014DC2BD10; Tue, 14 May 2024 11:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715685340; bh=DqY1oSmx3Ja7UajFq61UR1ouPaeUPXDRlpPUJOmgvtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f/ubUAlyLRfaI3DzvddtWfYF6Lp8N4VS97zeX8EF/DTYfjmvDEd2iqphXYj5z92XP Z39Fm+R0Zm9NRmbbYizafTPPvNwm4e43ye5qZUpJ2WBqvoTLRiA8+6UhkQs9Xs92PD /cWn2NXLoFvqlaOGuzyxxSnON1IJeNtovAwPhqcE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li Nan , Yu Kuai , Tejun Heo , Jens Axboe , Sasha Levin Subject: [PATCH 6.6 172/301] blk-iocost: do not WARN if iocg was already offlined Date: Tue, 14 May 2024 12:17:23 +0200 Message-ID: <20240514101038.751094704@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Nan [ Upstream commit 01bc4fda9ea0a6b52f12326486f07a4910666cf6 ] In iocg_pay_debt(), warn is triggered if 'active_list' is empty, which is intended to confirm iocg is active when it has debt. However, warn can be triggered during a blkcg or disk removal, if iocg_waitq_timer_fn() is run at that time: WARNING: CPU: 0 PID: 2344971 at block/blk-iocost.c:1402 iocg_pay_debt+0x14c/0x190 Call trace: iocg_pay_debt+0x14c/0x190 iocg_kick_waitq+0x438/0x4c0 iocg_waitq_timer_fn+0xd8/0x130 __run_hrtimer+0x144/0x45c __hrtimer_run_queues+0x16c/0x244 hrtimer_interrupt+0x2cc/0x7b0 The warn in this situation is meaningless. Since this iocg is being removed, the state of the 'active_list' is irrelevant, and 'waitq_timer' is canceled after removing 'active_list' in ioc_pd_free(), which ensures iocg is freed after iocg_waitq_timer_fn() returns. Therefore, add the check if iocg was already offlined to avoid warn when removing a blkcg or disk. Signed-off-by: Li Nan Reviewed-by: Yu Kuai Acked-by: Tejun Heo Link: https://lore.kernel.org/r/20240419093257.3004211-1-linan666@huaweicloud.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-iocost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index a382b3a39820a..0dca77591d66c 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -1439,8 +1439,11 @@ static void iocg_pay_debt(struct ioc_gq *iocg, u64 abs_vpay, lockdep_assert_held(&iocg->ioc->lock); lockdep_assert_held(&iocg->waitq.lock); - /* make sure that nobody messed with @iocg */ - WARN_ON_ONCE(list_empty(&iocg->active_list)); + /* + * make sure that nobody messed with @iocg. Check iocg->pd.online + * to avoid warn when removing blkcg or disk. + */ + WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->pd.online); WARN_ON_ONCE(iocg->inuse > 1); iocg->abs_vdebt -= min(abs_vpay, iocg->abs_vdebt); -- 2.43.0