mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yu Kuai <yukuai3@huawei.com>
To: <hch@infradead.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 1/4] Revert "blk-throttle: remove tg_drain_bios"
Date: Sat, 27 Nov 2021 18:10:56 +0800	[thread overview]
Message-ID: <20211127101059.477405-2-yukuai3@huawei.com> (raw)
In-Reply-To: <20211127101059.477405-1-yukuai3@huawei.com>

This reverts commit 32e3374304c7c317c05a61f3ddc315dbd46424f2.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 block/blk-throttle.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 39bb6e68a9a2..230e300c5856 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2257,6 +2257,28 @@ void blk_throtl_bio_endio(struct bio *bio)
 }
 #endif
 
+/*
+ * Dispatch all bios from all children tg's queued on @parent_sq.  On
+ * return, @parent_sq is guaranteed to not have any active children tg's
+ * and all bios from previously active tg's are on @parent_sq->bio_lists[].
+ */
+static void tg_drain_bios(struct throtl_service_queue *parent_sq)
+{
+	struct throtl_grp *tg;
+
+	while ((tg = throtl_rb_first(parent_sq))) {
+		struct throtl_service_queue *sq = &tg->service_queue;
+		struct bio *bio;
+
+		throtl_dequeue_tg(tg);
+
+		while ((bio = throtl_peek_queued(&sq->queued[READ])))
+			tg_dispatch_one_bio(tg, bio_data_dir(bio));
+		while ((bio = throtl_peek_queued(&sq->queued[WRITE])))
+			tg_dispatch_one_bio(tg, bio_data_dir(bio));
+	}
+}
+
 int blk_throtl_init(struct request_queue *q)
 {
 	struct throtl_data *td;
-- 
2.31.1


  reply	other threads:[~2021-11-27 10:00 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-27 10:10 [PATCH 0/4] cancel all throttled bios in del_gendisk() Yu Kuai
2021-11-27 10:10 ` Yu Kuai [this message]
2021-11-29 11:45   ` [PATCH 1/4] Revert "blk-throttle: remove tg_drain_bios" Christoph Hellwig
2021-11-27 10:10 ` [PATCH 2/4] blk-throtl: don't warn in tg_drain_bios() Yu Kuai
2021-11-29 11:46   ` Christoph Hellwig
2021-11-27 10:10 ` [PATCH 3/4] blk-throtl: introduce blk_throtl_cancel_bios() Yu Kuai
2021-11-29 11:47   ` Christoph Hellwig
2021-11-29 13:58     ` yukuai (C)
2021-11-27 10:10 ` [PATCH 4/4] block: cancel all throttled bios in del_gendisk() Yu Kuai
  -- strict thread matches above, loose matches on Subject: below --
2021-09-22 12:51 [PATCH 0/4] cancel all throttled bios in blk_cleanup_queue() Yu Kuai
2021-09-22 12:51 ` [PATCH 1/4] Revert "blk-throttle: remove tg_drain_bios" Yu Kuai

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=20211127101059.477405-2-yukuai3@huawei.com \
    --to=yukuai3@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=cgroups@vger.kernel.org \
    --cc=hch@infradead.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®