blk-mq-sched: inform sbitmap of shallow depth changes

If the scheduler returns a new shallow depth setting, then inform
sbitmap so it can update the wait batch counts.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 25c14c58385c86ff3f5b33135d77fb3984eff185..0c53a254671f5395918ef2c3487ac67dabb76ead 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -16,6 +16,32 @@
 #include "blk-mq-tag.h"
 #include "blk-wbt.h"
 
+void blk_mq_sched_limit_depth(struct elevator_queue *e,
+                             struct blk_mq_alloc_data *data, unsigned int op)
+{
+       struct blk_mq_tags *tags = blk_mq_tags_from_data(data);
+       struct sbitmap_queue *bt;
+       int ret;
+
+       /*
+        * Flush requests are special and go directly to the
+        * dispatch list.
+        */
+       if (op_is_flush(op) || !e->type->ops.mq.limit_depth)
+               return;
+
+       ret = e->type->ops.mq.limit_depth(op, data);
+       if (!ret)
+               return;
+
+       if (data->flags & BLK_MQ_REQ_RESERVED)
+               bt = &tags->breserved_tags;
+       else
+               bt = &tags->bitmap_tags;
+
+       sbitmap_queue_shallow_depth(bt, ret);
+}
+
 void blk_mq_sched_free_hctx_data(struct request_queue *q,
                                 void (*exit)(struct blk_mq_hw_ctx *))
 {

diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 1e9c9018ace127977acdb67e41fefc20955b1991..6abebc1b9ae0e2ae9c961ee6b2bd74225268b0ed 100644 (file)
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -5,6 +5,9 @@
 #include "blk-mq.h"
 #include "blk-mq-tag.h"
 
+void blk_mq_sched_limit_depth(struct elevator_queue *e,
+                             struct blk_mq_alloc_data *data, unsigned int op);
+
 void blk_mq_sched_free_hctx_data(struct request_queue *q,
                                 void (*exit)(struct blk_mq_hw_ctx *));
 

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 4e9d83594cca40577b624a8cd304ff41977e5d4f..1bb7aa40c1925df8aafa1b9d3451b72230ea4e01 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -357,13 +357,7 @@ static struct request *blk_mq_get_request(struct request_queue *q,
 
        if (e) {
                data->flags |= BLK_MQ_REQ_INTERNAL;
-
-               /*
-                * Flush requests are special and go directly to the
-                * dispatch list.
-                */
-               if (!op_is_flush(op) && e->type->ops.mq.limit_depth)
-                       e->type->ops.mq.limit_depth(op, data);
+               blk_mq_sched_limit_depth(e, data, op);
        }
 
        tag = blk_mq_get_tag(data);