From patchwork Thu Dec 2 13:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 12652563 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D12D0C433F5 for ; Thu, 2 Dec 2021 12:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358119AbhLBM4L (ORCPT ); Thu, 2 Dec 2021 07:56:11 -0500 Received: from szxga08-in.huawei.com ([45.249.212.255]:29082 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358143AbhLBM4J (ORCPT ); Thu, 2 Dec 2021 07:56:09 -0500 Received: from kwepemi100004.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4J4bQK1FZCz1DJn3; Thu, 2 Dec 2021 20:50:01 +0800 (CST) Received: from kwepemm600009.china.huawei.com (7.193.23.164) by kwepemi100004.china.huawei.com (7.221.188.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 2 Dec 2021 20:52:43 +0800 Received: from huawei.com (10.175.127.227) by kwepemm600009.china.huawei.com (7.193.23.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 2 Dec 2021 20:52:43 +0800 From: Yu Kuai To: , , CC: , , , , Subject: [PATCH v4 1/2] blk-throtl: move WARN_ON_ONCE() from throtl_rb_first() to it's caller Date: Thu, 2 Dec 2021 21:04:39 +0800 Message-ID: <20211202130440.1943847-2-yukuai3@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211202130440.1943847-1-yukuai3@huawei.com> References: <20211202130440.1943847-1-yukuai3@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600009.china.huawei.com (7.193.23.164) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Prepare to reintroduce tg_drain_bios(), which will iterate until throtl_rb_first() return NULL. Signed-off-by: Yu Kuai --- block/blk-throttle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 39bb6e68a9a2..fdd57878e862 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -502,7 +502,6 @@ throtl_rb_first(struct throtl_service_queue *parent_sq) struct rb_node *n; n = rb_first_cached(&parent_sq->pending_tree); - WARN_ON_ONCE(!n); if (!n) return NULL; return rb_entry_tg(n); @@ -521,7 +520,7 @@ static void update_min_dispatch_time(struct throtl_service_queue *parent_sq) struct throtl_grp *tg; tg = throtl_rb_first(parent_sq); - if (!tg) + if (WARN_ON_ONCE(!tg)) return; parent_sq->first_pending_disptime = tg->disptime; @@ -1090,7 +1089,7 @@ static int throtl_select_dispatch(struct throtl_service_queue *parent_sq) break; tg = throtl_rb_first(parent_sq); - if (!tg) + if (WARN_ON_ONCE(!tg)) break; if (time_before(jiffies, tg->disptime))