From: Yu Kuai <yukuai3@huawei.com> To: <mkoutny@suse.com>, <paulmck@kernel.org>, <tj@kernel.org>, <axboe@kernel.dk> Cc: <cgroups@vger.kernel.org>, <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <yukuai3@huawei.com>, <yi.zhang@huawei.com> Subject: [PATCH v6 1/2] blk-throtl: move WARN_ON_ONCE() from throtl_rb_first() to it's caller Date: Mon, 10 Jan 2022 21:47:57 +0800 [thread overview] Message-ID: <20220110134758.2233758-2-yukuai3@huawei.com> (raw) In-Reply-To: <20220110134758.2233758-1-yukuai3@huawei.com> Prepare to reintroduce tg_drain_bios(), which will iterate until throtl_rb_first() return NULL. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- 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)) -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> To: mkoutny-IBi9RG/b67k@public.gmane.org, paulmck-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, yi.zhang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Subject: [PATCH v6 1/2] blk-throtl: move WARN_ON_ONCE() from throtl_rb_first() to it's caller Date: Mon, 10 Jan 2022 21:47:57 +0800 [thread overview] Message-ID: <20220110134758.2233758-2-yukuai3@huawei.com> (raw) In-Reply-To: <20220110134758.2233758-1-yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> Prepare to reintroduce tg_drain_bios(), which will iterate until throtl_rb_first() return NULL. Signed-off-by: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> --- 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)) -- 2.31.1
next prev parent reply other threads:[~2022-01-10 13:37 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-10 13:47 [PATCH v6 0/2] cancel all throttled bios in del_gendisk() Yu Kuai 2022-01-10 13:47 ` Yu Kuai 2022-01-10 13:47 ` Yu Kuai [this message] 2022-01-10 13:47 ` [PATCH v6 1/2] blk-throtl: move WARN_ON_ONCE() from throtl_rb_first() to it's caller Yu Kuai 2022-01-10 13:47 ` [PATCH v6 2/2] block: cancel all throttled bios in del_gendisk() Yu Kuai 2022-01-10 13:47 ` Yu Kuai 2022-01-12 3:05 ` Ming Lei 2022-01-13 8:46 ` yukuai (C) 2022-01-13 8:46 ` yukuai (C) 2022-01-14 3:05 ` Ming Lei 2022-01-14 8:21 ` yukuai (C) 2022-01-14 8:21 ` yukuai (C) 2022-01-17 9:21 ` Ming Lei 2022-01-18 8:48 ` yukuai (C) 2022-01-18 8:48 ` yukuai (C) 2022-01-18 13:28 ` Ming Lei 2022-01-19 2:24 ` yukuai (C) 2022-01-19 2:24 ` yukuai (C) 2022-01-24 3:48 ` yukuai (C) 2022-01-24 3:48 ` yukuai (C) 2022-01-24 3:50 ` yukuai (C) 2022-01-24 3:50 ` yukuai (C) 2022-01-26 17:03 ` Tejun Heo 2022-01-26 17:03 ` Tejun Heo 2022-01-27 2:45 ` yukuai (C) 2022-01-27 2:45 ` yukuai (C) 2022-01-27 5:03 ` Ming Lei 2022-01-27 5:03 ` Ming Lei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220110134758.2233758-2-yukuai3@huawei.com \ --to=yukuai3@huawei.com \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mkoutny@suse.com \ --cc=paulmck@kernel.org \ --cc=tj@kernel.org \ --cc=yi.zhang@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.