[PATCH 1/4] Revert "blk-throttle: remove tg_drain_bios"
From: Yu Kuai <hidden>
Date: 2021-09-22 12:41:48
Also in:
linux-block, lkml
Subsystem:
block layer, control group - block io controller (blkio), the rest · Maintainers:
Jens Axboe, Tejun Heo, Josef Bacik, Linus Torvalds
This reverts commit 32e3374304c7c317c05a61f3ddc315dbd46424f2. Signed-off-by: Yu Kuai <redacted> --- block/blk-throttle.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 7c4e7993ba97..43dee985170b 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c@@ -2412,6 +2412,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