Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

virtio-blk: base queue-depth on virtqueue ringsize or module param

Venkatash spake thus:

virtio-blk set the default queue depth to 64 requests, which was
insufficient for high-IOPS devices. Instead set the blk-queue depth to
the device's virtqueue depth divided by two (each I/O requires at least
two VQ entries).

But behold, Ted added a module parameter:

Also allow the queue depth to be something which can be set at module
load time or via a kernel boot-time parameter, for
testing/benchmarking purposes.

And I rewrote it substantially, mainly to take
VIRTIO_RING_F_INDIRECT_DESC into account.

As QEMU sets the vq size for PCI to 128, Venkatash's patch wouldn't
have made a change. This version does (since QEMU also offers
VIRTIO_RING_F_INDIRECT_DESC.

Inspired-by: "Theodore Ts'o" <tytso@mit.edu>
Based-on-the-true-story-of: Venkatesh Srinivas <venkateshs@google.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: virtio-dev@lists.oasis-open.org
Cc: virtualization@lists.linux-foundation.org
Cc: Frank Swiderski <fes@google.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

+9 -1
+9 -1
drivers/block/virtio_blk.c
··· 491 491 static struct blk_mq_reg virtio_mq_reg = { 492 492 .ops = &virtio_mq_ops, 493 493 .nr_hw_queues = 1, 494 - .queue_depth = 64, 494 + .queue_depth = 0, /* Set in virtblk_probe */ 495 495 .numa_node = NUMA_NO_NODE, 496 496 .flags = BLK_MQ_F_SHOULD_MERGE, 497 497 }; 498 + module_param_named(queue_depth, virtio_mq_reg.queue_depth, uint, 0444); 498 499 499 500 static void virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx, 500 501 struct request *rq, unsigned int nr) ··· 559 558 goto out_free_vq; 560 559 } 561 560 561 + /* Default queue sizing is to fill the ring. */ 562 + if (!virtio_mq_reg.queue_depth) { 563 + virtio_mq_reg.queue_depth = vblk->vq->num_free; 564 + /* ... but without indirect descs, we use 2 descs per req */ 565 + if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC)) 566 + virtio_mq_reg.queue_depth /= 2; 567 + } 562 568 virtio_mq_reg.cmd_size = 563 569 sizeof(struct virtblk_req) + 564 570 sizeof(struct scatterlist) * sg_elems;