[11/14] rq-qos: introduce dio_bio callback

Commit Message

Josef Bacik July 3, 2018, 3:15 p.m. UTC

From: Josef Bacik <[e-mail]>

wbt cares only about request completion time, but controllers may need
information that is on the bio itself, so add a done_bio callback for
rq-qos so things like blk-iolatency can use it to have the bio when it
completes.

Signed-off-by: Josef Bacik <[e-mail]>
---
 block/bio.c        |  4 ++++
 block/blk-rq-qos.c | 10 ++++++++++
 block/blk-rq-qos.h |  2 ++
 3 files changed, 16 insertions(+)

Comments

Randy Dunlap July 3, 2018, 7:29 p.m. UTC | #1

On 07/03/2018 08:15 AM, Josef Bacik wrote:
> From: Josef Bacik <[e-mail]>
> 
> wbt cares only about request completion time, but controllers may need

Please spell out wt^Hbt.
whatever it is.

> information that is on the bio itself, so add a done_bio callback for
> rq-qos so things like blk-iolatency can use it to have the bio when it
> completes.
> 
> Signed-off-by: Josef Bacik <[e-mail]>
> ---
>  block/bio.c        |  4 ++++
>  block/blk-rq-qos.c | 10 ++++++++++
>  block/blk-rq-qos.h |  2 ++
>  3 files changed, 16 insertions(+)

Jens Axboe July 3, 2018, 7:33 p.m. UTC | #2

On 7/3/18 1:29 PM, Randy Dunlap wrote:
> On 07/03/2018 08:15 AM, Josef Bacik wrote:
>> From: Josef Bacik <[e-mail]>
>>
>> wbt cares only about request completion time, but controllers may need
> 
> Please spell out wt^Hbt.
> whatever it is.

It's blk-wbt, so wbt is fine, I think it should be pretty clear from
the context of what is being changed.

Patch

diff --git a/block/bio.c b/block/bio.c
index e09f3626ab5b..5df998515adc 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -32,6 +32,7 @@ 
 
 #include <trace/events/block.h>
 #include "blk.h"
+#include "blk-rq-qos.h"
 
 /*
  * Test patch to inline a certain number of bi_io_vec's inside the bio
@@ -1808,6 +1809,9 @@  void bio_endio(struct bio *bio)
 	if (!bio_integrity_endio(bio))
 		return;
 
+	if (bio->bi_disk)
+		rq_qos_done_bio(bio->bi_disk->queue, bio);
+
 	/*
 	 * Need to have a real endio function for chained bios, otherwise
 	 * various corner cases will break (like stacking block devices that
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index b7b02e04f64f..5134b24482f6 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -88,6 +88,16 @@  void rq_qos_track(struct request_queue *q, struct request *rq, struct bio *bio)
 	}
 }
 
+void rq_qos_done_bio(struct request_queue *q, struct bio *bio)
+{
+	struct rq_qos *rqos;
+
+	for(rqos = q->rq_qos; rqos; rqos = rqos->next) {
+		if (rqos->ops->done_bio)
+			rqos->ops->done_bio(rqos, bio);
+	}
+}
+
 /*
  * Return true, if we can't increase the depth further by scaling
  */
diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h
index a6d13b8ce0dc..d5e2f68fe41e 100644
--- a/block/blk-rq-qos.h
+++ b/block/blk-rq-qos.h
@@ -30,6 +30,7 @@  struct rq_qos_ops {
 	void (*issue)(struct rq_qos *, struct request *);
 	void (*requeue)(struct rq_qos *, struct request *);
 	void (*done)(struct rq_qos *, struct request *);
+	void (*done_bio)(struct rq_qos *, struct bio *);
 	void (*cleanup)(struct rq_qos *, struct bio *);
 	void (*exit)(struct rq_qos *);
 };
@@ -101,6 +102,7 @@  void rq_qos_cleanup(struct request_queue *, struct bio *);
 void rq_qos_done(struct request_queue *, struct request *);
 void rq_qos_issue(struct request_queue *, struct request *);
 void rq_qos_requeue(struct request_queue *, struct request *);
+void rq_qos_done_bio(struct request_queue *q, struct bio *bio);
 void rq_qos_throttle(struct request_queue *, struct bio *, spinlock_t *);
 void rq_qos_track(struct request_queue *q, struct request *, struct bio *);
 void rq_qos_exit(struct request_queue *);