diff options
| author | Jens Axboe <axboe@fb.com> | 2017-01-17 06:03:22 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-17 10:04:20 -0700 |
| commit | bd166ef183c263c5ced656d49ef19c7da4adc774 (patch) | |
| tree | 449bbd3b4e671b370b96e3846b2281116e7089e9 /block/blk-ioc.c | |
| parent | 2af8cbe30531eca73c8f3ba277f155fc0020b01a (diff) | |
| download | linux-0-day-bd166ef183c263c5ced656d49ef19c7da4adc774.tar.gz linux-0-day-bd166ef183c263c5ced656d49ef19c7da4adc774.tar.xz | |
blk-mq-sched: add framework for MQ capable IO schedulers
This adds a set of hooks that intercepts the blk-mq path of
allocating/inserting/issuing/completing requests, allowing
us to develop a scheduler within that framework.
We reuse the existing elevator scheduler API on the registration
side, but augment that with the scheduler flagging support for
the blk-mq interfce, and with a separate set of ops hooks for MQ
devices.
We split driver and scheduler tags, so we can run the scheduling
independently of device queue depth.
Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Diffstat (limited to 'block/blk-ioc.c')
| -rw-r--r-- | block/blk-ioc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index ab372092a57d4..fe186a9eade98 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -43,7 +43,9 @@ static void ioc_exit_icq(struct io_cq *icq) if (icq->flags & ICQ_EXITED) return; - if (et->ops.sq.elevator_exit_icq_fn) + if (et->uses_mq && et->ops.mq.exit_icq) + et->ops.mq.exit_icq(icq); + else if (!et->uses_mq && et->ops.sq.elevator_exit_icq_fn) et->ops.sq.elevator_exit_icq_fn(icq); icq->flags |= ICQ_EXITED; @@ -383,7 +385,9 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q, if (likely(!radix_tree_insert(&ioc->icq_tree, q->id, icq))) { hlist_add_head(&icq->ioc_node, &ioc->icq_list); list_add(&icq->q_node, &q->icq_list); - if (et->ops.sq.elevator_init_icq_fn) + if (et->uses_mq && et->ops.mq.init_icq) + et->ops.mq.init_icq(icq); + else if (!et->uses_mq && et->ops.sq.elevator_init_icq_fn) et->ops.sq.elevator_init_icq_fn(icq); } else { kmem_cache_free(et->icq_cache, icq); |