aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/virtio_blk.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-10-29 13:14:52 -0400
committerJens Axboe <axboe@fb.com>2014-10-29 13:14:52 -0400
commit74c450521dd8d245b982da62592a18aa6f88b045 (patch)
treeb45928c02f0ee9051cd5cb257ad4bf1e0df125a8 /drivers/block/virtio_blk.c
parent34b48db66e08ca1c1bc07cf305d672ac940268dc (diff)
blk-mq: add a 'list' parameter to ->queue_rq()
Since we have the notion of a 'last' request in a chain, we can use this to have the hardware optimize the issuing of requests. Add a list_head parameter to queue_rq that the driver can use to temporarily store hw commands for issue when 'last' is true. If we are doing a chain of requests, pass in a NULL list for the first request to force issue of that immediately, then batch the remainder for deferred issue until the last request has been sent. Instead of adding yet another argument to the hot ->queue_rq path, encapsulate the passed arguments in a blk_mq_queue_data structure. This is passed as a constant, and has been tested as faster than passing 4 (or even 3) args through ->queue_rq. Update drivers for the new ->queue_rq() prototype. There are no functional changes in this patch for drivers - if they don't use the passed in list, then they will just queue requests individually like before. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/virtio_blk.c')
-rw-r--r--drivers/block/virtio_blk.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index c6a27d54ad62..cecd3f983e49 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -158,10 +158,11 @@ static void virtblk_done(struct virtqueue *vq)
158 spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags); 158 spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags);
159} 159}
160 160
161static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req, 161static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx,
162 bool last) 162 const struct blk_mq_queue_data *bd)
163{ 163{
164 struct virtio_blk *vblk = hctx->queue->queuedata; 164 struct virtio_blk *vblk = hctx->queue->queuedata;
165 struct request *req = bd->rq;
165 struct virtblk_req *vbr = blk_mq_rq_to_pdu(req); 166 struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
166 unsigned long flags; 167 unsigned long flags;
167 unsigned int num; 168 unsigned int num;
@@ -222,7 +223,7 @@ static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req,
222 return BLK_MQ_RQ_QUEUE_ERROR; 223 return BLK_MQ_RQ_QUEUE_ERROR;
223 } 224 }
224 225
225 if (last && virtqueue_kick_prepare(vblk->vqs[qid].vq)) 226 if (bd->last && virtqueue_kick_prepare(vblk->vqs[qid].vq))
226 notify = true; 227 notify = true;
227 spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags); 228 spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags);
228 229