Skip to contentSkip to conversation

virtio-blk: Initialize blkqueue depth from virtqueue size

PATCH New Venkatesh Srinivas 6 participants 16 messages Mar 14, 2014 – Apr 2, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio-blk: Initialize blkqueue depth from virtqueue size

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).

---
 drivers/block/virtio_blk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/virtio_blk.c +1 -1
index b1cb3f4..863ab02 100644
@@ -485,7 +485,6 @@ static struct blk_mq_ops virtio_mq_ops = {
 static struct blk_mq_reg virtio_mq_reg = {
 	.ops		= &virtio_mq_ops,
 	.nr_hw_queues	= 1,
-	.queue_depth	= 64,
 	.numa_node	= NUMA_NO_NODE,
 	.flags		= BLK_MQ_F_SHOULD_MERGE,
 };
@@ -555,6 +554,7 @@ static int virtblk_probe(struct virtio_device *vdev)
 	virtio_mq_reg.cmd_size =
 		sizeof(struct virtblk_req) +
 		sizeof(struct scatterlist) * sg_elems;
+	virtio_mq_reg.queue_depth = vblk->vq->num_free / 2;
 
 	q = vblk->disk->queue = blk_mq_init_queue(&virtio_mq_reg, vblk);
 	if (!q) {
Signature · 1 line
1.9.0.279.gdc9e3eb
#1 lore raw

PATCH 1/1 virtio-blk: make the queue depth the max supportable by the hypervisor

The current virtio block sets a queue depth of 64, which is insufficient for very fast devices. It has been demonstrated that with a high IOPS device, using a queue depth of 256 can double the IOPS which can be sustained.

As suggested by Venkatash Srinivas, set the queue depth by default to be one half the the device's virtqueue, which is the maximum queue depth that can be supported by the channel to the host OS (each I/O request requires at least two VQ entries).

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.

---

This is a combination of my patch and Vekatash's patch. I agree that setting the default automatically is better than requiring the user to set the value by hand.

 drivers/block/virtio_blk.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/block/virtio_blk.c +8 -2
index 6a680d4..0f70c01 100644
@@ -481,6 +481,9 @@ static struct blk_mq_ops virtio_mq_ops = {
 	.free_hctx	= blk_mq_free_single_hw_queue,
 };
 
+static int queue_depth = -1;
+module_param(queue_depth, int, 0444);
+
 static struct blk_mq_reg virtio_mq_reg = {
 	.ops		= &virtio_mq_ops,
 	.nr_hw_queues	= 1,
@@ -551,9 +554,14 @@ static int virtblk_probe(struct virtio_device *vdev)
 		goto out_free_vq;
 	}
 
+	virtio_mq_reg.queue_depth = queue_depth > 0 ? queue_depth :
+		(vblk->vq->num_free / 2);
 	virtio_mq_reg.cmd_size =
 		sizeof(struct virtblk_req) +
 		sizeof(struct scatterlist) * sg_elems;
+	virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN);
+	pr_info("%s: using queue depth %d\n", vblk->disk->disk_name,
+		virtio_mq_reg.queue_depth);
 
 	q = vblk->disk->queue = blk_mq_init_queue(&virtio_mq_reg, vblk);
 	if (!q) {
@@ -565,8 +573,6 @@ static int virtblk_probe(struct virtio_device *vdev)
 
 	q->queuedata = vblk;
 
-	virtblk_name_format("vd", index, vblk->disk->disk_name, DISK_NAME_LEN);
-
 	vblk->disk->major = major;
 	vblk->disk->first_minor = index_to_minor(index);
 	vblk->disk->private_data = vblk;
Signature · 1 line
1.9.0
#2 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 35 lines · Theodore Ts'o

The current virtio block sets a queue depth of 64, which is insufficient for very fast devices. It has been demonstrated that with a high IOPS device, using a queue depth of 256 can double the IOPS which can be sustained.

As suggested by Venkatash Srinivas, set the queue depth by default to be one half the the device's virtqueue, which is the maximum queue depth that can be supported by the channel to the host OS (each I/O request requires at least two VQ entries).

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.

---

This is a combination of my patch and Vekatash's patch. I agree that setting the default automatically is better than requiring the user to set the value by hand.

drivers/block/virtio_blk.c | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
drivers/block/virtio_blk.c +0 -0
index 6a680d4..0f70c01 100644

drivers/block/virtio_blk.c static struct blk_mq_ops virtio_mq_ops = { · line 485

Quoted 5 lines
drivers/block/virtio_blk.c +2 -0
@@ -481,6 +481,9 @@ static struct blk_mq_ops virtio_mq_ops = {
 	.free_hctx	= blk_mq_free_single_hw_queue,
 };
 
+static int queue_depth = -1;
+module_param(queue_depth, int, 0444);

?

Quoted 8 lines
drivers/block/virtio_blk.c +1 -0
+
 static struct blk_mq_reg virtio_mq_reg = {
 	.ops		= &virtio_mq_ops,
 	.nr_hw_queues	= 1,
@@ -551,9 +554,14 @@ static int virtblk_probe(struct virtio_device
 *vdev)
 		goto out_free_vq;
 	}

drivers/block/virtio_blk.c static int virtblk_probe(struct virtio_device · line 566

Quoted 10 lines
drivers/block/virtio_blk.c +5 -0
 
+	virtio_mq_reg.queue_depth = queue_depth > 0 ? queue_depth :
+		(vblk->vq->num_free / 2);
 	virtio_mq_reg.cmd_size =
 		sizeof(struct virtblk_req) +
 		sizeof(struct scatterlist) * sg_elems;
+	virtblk_name_format("vd", index, vblk->disk->disk_name,
 DISK_NAME_LEN);
+	pr_info("%s: using queue depth %d\n", vblk->disk->disk_name,
+		virtio_mq_reg.queue_depth);

Isn't that visible from sysfs?

Quoted 14 lines
drivers/block/virtio_blk.c +0 -0
 	q = vblk->disk->queue = blk_mq_init_queue(&virtio_mq_reg, vblk);
	if (!q) {
drivers/block/virtio_blk.c +0 -2
@@ -565,8 +573,6 @@ static int virtblk_probe(struct virtio_device
 *vdev)
 
 	q->queuedata = vblk;
 
-	virtblk_name_format("vd", index, vblk->disk->disk_name,
 DISK_NAME_LEN);
-
 	vblk->disk->major = major;
	vblk->disk->first_minor = index_to_minor(index);
	vblk->disk->private_data = vblk;
#3 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 4 lines · Konrad Rzeszutek Wilk

drivers/block/virtio_blk.c static int virtblk_probe(struct virtio_device *vdev) · line 564

Quoted 2 lines
drivers/block/virtio_blk.c +2 -0
+	pr_info("%s: using queue depth %d\n", vblk->disk->disk_name,
+		virtio_mq_reg.queue_depth);

Isn't that visible from sysfs?

As near as I can tell, it's not. I haven't been able to find anything that either represents this value, or can be calculated from this value. Maybe I missed something?

- Ted

#4 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

In reply to Theodore Ts'o
Quoted 9 lines · Theodore Ts'o

The current virtio block sets a queue depth of 64, which is insufficient for very fast devices. It has been demonstrated that with a high IOPS device, using a queue depth of 256 can double the IOPS which can be sustained.

As suggested by Venkatash Srinivas, set the queue depth by default to be one half the the device's virtqueue, which is the maximum queue depth that can be supported by the channel to the host OS (each I/O request requires at least two VQ entries).

I don't think this should be a module parameter. The default sizing should be based of the parameters of the actual virtqueue, and if we want to allow tuning it it should be by a sysfs attribute, preferable using the same semantics as SCSI.

#5 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 4 lines · Christoph Hellwig

I don't think this should be a module parameter. The default sizing should be based of the parameters of the actual virtqueue, and if we want to allow tuning it it should be by a sysfs attribute, preferable using the same semantics as SCSI.

I wanted that too, but looking at the multiqueue code, it wasn't all obvious how to safely adjust the queue depth once the virtio-blk device driver is initialized and becomes active. There are all sorts data structures including bitmaps, etc. that would have to be resized, and I decided it would be too difficult / risky for me to make it be dynamically resizeable.

So I settled on a module parameter thinking it would mostly only used by testers / benchmarkers.

Can someone suggest a way to do a dynamic resizing of the virtio-blk queue depth easily / safely?

- Ted

#6 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

In reply to Theodore Ts'o
Quoted 5 lines · Theodore Ts'o

The current virtio block sets a queue depth of 64, which is insufficient for very fast devices. It has been demonstrated that with a high IOPS device, using a queue depth of 256 can double the IOPS which can be sustained.

Quoted 8 lines

As suggested by Venkatash Srinivas, set the queue depth by default to be one half the the device's virtqueue, which is the maximum queue depth that can be supported by the channel to the host OS (each I/O request requires at least two VQ entries).

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.

Note that with indirect descriptors (which is supported by Almost Everyone), we can actually use the full index, so this value is a bit pessimistic. But it's OK as a starting point.

Cheers,
Rusty.

#7 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 4 lines · Rusty Russell

Note that with indirect descriptors (which is supported by Almost Everyone), we can actually use the full index, so this value is a bit pessimistic. But it's OK as a starting point.

So is this something that can go upstream with perhaps a slight adjustment in the commit description? Do you think we need to be able to dynamically adjust the queue depth after the module has been loaded or the kernel has been booted? If so, anyone a hint about the best way to do that would be much appreciated.

Thanks,

- Ted

#8 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 8 lines · [email protected] writes:
Quoted 4 lines · Rusty Russell

Note that with indirect descriptors (which is supported by Almost Everyone), we can actually use the full index, so this value is a bit pessimistic. But it's OK as a starting point.

So is this something that can go upstream with perhaps a slight adjustment in the commit description?

Well, I rewrote it again, see below.

Quoted 3 lines

Do you think we need to be able
to dynamically adjust the queue depth after the module has been loaded or the kernel has been booted?

That would be nice, sure, but...

Quoted 2 lines

If so, anyone a hint about the best
way to do that would be much appreciated.

... I share your wonder and mystery at the ways of the block layer.

Subject: 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.

Based-on-the-true-story-of: Venkatesh Srinivas <[email protected]>

drivers/block/virtio_blk.c +9 -1
index a2db9ed288f2..c101bbc72095 100644
@@ -491,10 +491,11 @@ static struct blk_mq_ops virtio_mq_ops = {
 static struct blk_mq_reg virtio_mq_reg = {
 	.ops		= &virtio_mq_ops,
 	.nr_hw_queues	= 1,
-	.queue_depth	= 64,
+	.queue_depth	= 0, /* Set in virtblk_probe */
 	.numa_node	= NUMA_NO_NODE,
 	.flags		= BLK_MQ_F_SHOULD_MERGE,
 };
+module_param_named(queue_depth, virtio_mq_reg.queue_depth, uint, 0444);
 
 static void virtblk_init_vbr(void *data, struct blk_mq_hw_ctx *hctx,
 			     struct request *rq, unsigned int nr)
@@ -558,6 +559,13 @@ static int virtblk_probe(struct virtio_device *vdev)
 		goto out_free_vq;
 	}
 
+	/* Default queue sizing is to fill the ring. */
+	if (!virtio_mq_reg.queue_depth) {
+		virtio_mq_reg.queue_depth = vblk->vq->num_free;
+		/* ... but without indirect descs, we use 2 descs per req */
+		if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC))
+			virtio_mq_reg.queue_depth /= 2;
+	}
 	virtio_mq_reg.cmd_size =
 		sizeof(struct virtblk_req) +
 		sizeof(struct scatterlist) * sg_elems;
#9 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 6 lines

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.

That divide-by-2 produced the same queue depth as the prior computation in QEMU was deliberate -- but raising it to 128 seems pretty reasonable.

-- vs;

#10 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 7 lines · Venkatesh Srinivas
Quoted 6 lines

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.

Quoted 5 lines

That divide-by-2 produced the same queue depth as the prior computation in QEMU was deliberate -- but raising it to 128 seems pretty reasonable.

Soft ping about this patch.

Thanks,
-- vs;

#11 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 9 lines · Venkatesh Srinivas
Quoted 7 lines · Venkatesh Srinivas
Quoted 6 lines

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.

Quoted 7 lines
Quoted 5 lines

That divide-by-2 produced the same queue depth as the prior computation in QEMU was deliberate -- but raising it to 128 seems pretty reasonable.

Soft ping about this patch.

It's head of my virtio-next tree.

Cheers,
Rusty.

#12 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 2 lines · Rusty Russell

It's head of my virtio-next tree.

Hey Rusty,

While we have your attention --- what's your opinion about adding TRIM support to virtio-blk. I understand that you're starting an OASIS standardization process for virtio --- what does that mean vis-a-vis a patch to plumb discard support through virtio-blk?

Thanks!

- Ted

#13 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

In reply to Rusty Russell
Quoted 2 lines · Rusty Russell

It's head of my virtio-next tree.

Hey Rusty,

While we have your attention --- what's your opinion about adding TRIM support to virtio-blk. I understand that you're starting an OASIS standardization process for virtio --- what does that mean vis-a-vis a patch to plumb discard support through virtio-blk?

Thanks!

- Ted

#14 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 10 lines · Theodore Ts'o
Quoted 2 lines · Rusty Russell

It's head of my virtio-next tree.

Hey Rusty,

While we have your attention --- what's your opinion about adding TRIM support to virtio-blk. I understand that you're starting an OASIS standardization process for virtio --- what does that mean vis-a-vis a patch to plumb discard support through virtio-blk?

virtio-scsi already supports discard. But maybe you cannot switch away from virtio-blk?

If you need to add discard to virtio-blk then it could be added to the standard. The standards text is kept in a svn repository here:
https://tools.oasis-open.org/version-control/browse/wsvn/virtio/

Stefan

#15 lore raw

Re: [PATCH] virtio-blk: make the queue depth the max supportable by the hypervisor

Quoted 12 lines · Stefan Hajnoczi
Quoted 10 lines · Theodore Ts'o
Quoted 2 lines · Rusty Russell

It's head of my virtio-next tree.

Hey Rusty,

While we have your attention --- what's your opinion about adding TRIM support to virtio-blk. I understand that you're starting an OASIS standardization process for virtio --- what does that mean vis-a-vis a patch to plumb discard support through virtio-blk?

Quoted 6 lines

virtio-scsi already supports discard. But maybe you cannot switch away from virtio-blk?

If you need to add discard to virtio-blk then it could be added to the standard. The standards text is kept in a svn repository here:
https://tools.oasis-open.org/version-control/browse/wsvn/virtio/

It would be trivial to add, and I wouldn't be completely opposed, but we generally point to virtio-scsi when people want actual features.

Cheers,
Rusty.