[3/4] blk-throtl: introduce blk_throtl_cancel_bios()

Commit Message

Yu Kuai Nov. 27, 2021, 10:10 a.m. UTC

This function is used to cancel all throttled bios. Noted this
modification is mainly from revertion of commit b77412372b68
("blk-throttle: remove blk_throtl_drain").

Signed-off-by: Yu Kuai <[e-mail]>
---
 block/blk-throttle.c | 37 +++++++++++++++++++++++++++++++++++++
 block/blk-throttle.h |  2 ++
 2 files changed, 39 insertions(+)

Comments

Christoph Hellwig Nov. 29, 2021, 11:47 a.m. UTC | #1

On Sat, Nov 27, 2021 at 06:10:58PM +0800, Yu Kuai wrote:
> This function is used to cancel all throttled bios. Noted this
> modification is mainly from revertion of commit b77412372b68
> ("blk-throttle: remove blk_throtl_drain").

This should also go into the last patch.

Yu Kuai Nov. 29, 2021, 1:58 p.m. UTC | #2

On 2021/11/29 19:47, Christoph Hellwig wrote:
> On Sat, Nov 27, 2021 at 06:10:58PM +0800, Yu Kuai wrote:
>> This function is used to cancel all throttled bios. Noted this
>> modification is mainly from revertion of commit b77412372b68
>> ("blk-throttle: remove blk_throtl_drain").
> 
> This should also go into the last patch.
> .
> 

I'll merge patch 1,3,4 into one patch,

Thanks,
Kuai

Patch

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 25822c88bea1..b31ae8a2c8b5 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -2280,6 +2280,43 @@  static void tg_drain_bios(struct throtl_service_queue *parent_sq)
 	}
 }
 
+/**
+ * blk_throtl_cancel_bios - cancel throttled bios
+ * @q: request_queue to cancel throttled bios for
+ *
+ * This function is called to error all currently throttled bios on @q.
+ */
+void blk_throtl_cancel_bios(struct request_queue *q)
+{
+	struct throtl_data *td = q->td;
+	struct blkcg_gq *blkg;
+	struct cgroup_subsys_state *pos_css;
+	struct bio *bio;
+	int rw;
+
+	rcu_read_lock();
+
+	/*
+	 * Drain each tg while doing post-order walk on the blkg tree, so
+	 * that all bios are propagated to td->service_queue.  It'd be
+	 * better to walk service_queue tree directly but blkg walk is
+	 * easier.
+	 */
+	blkg_for_each_descendant_post(blkg, pos_css, td->queue->root_blkg)
+		tg_drain_bios(&blkg_to_tg(blkg)->service_queue);
+
+	/* finally, transfer bios from top-level tg's into the td */
+	tg_drain_bios(&td->service_queue);
+
+	rcu_read_unlock();
+
+	/* all bios now should be in td->service_queue, cancel them */
+	for (rw = READ; rw <= WRITE; rw++)
+		while ((bio = throtl_pop_queued(&td->service_queue.queued[rw],
+						NULL)))
+			bio_io_error(bio);
+}
+
 int blk_throtl_init(struct request_queue *q)
 {
 	struct throtl_data *td;
diff --git a/block/blk-throttle.h b/block/blk-throttle.h
index 175f03abd9e4..9d67d5139954 100644
--- a/block/blk-throttle.h
+++ b/block/blk-throttle.h
@@ -160,12 +160,14 @@  static inline void blk_throtl_exit(struct request_queue *q) { }
 static inline void blk_throtl_register_queue(struct request_queue *q) { }
 static inline void blk_throtl_charge_bio_split(struct bio *bio) { }
 static inline bool blk_throtl_bio(struct bio *bio) { return false; }
+#define blk_throtl_cancel_bios(q)  do { } while (0)
 #else /* CONFIG_BLK_DEV_THROTTLING */
 int blk_throtl_init(struct request_queue *q);
 void blk_throtl_exit(struct request_queue *q);
 void blk_throtl_register_queue(struct request_queue *q);
 void blk_throtl_charge_bio_split(struct bio *bio);
 bool __blk_throtl_bio(struct bio *bio);
+void blk_throtl_cancel_bios(struct request_queue *q);
 static inline bool blk_throtl_bio(struct bio *bio)
 {
 	struct throtl_grp *tg = blkg_to_tg(bio->bi_blkg);