Skip to contentSkip to conversation

virtio: stregthen virtqueue size invariants

PATCH In review Denis Plotnikov 2 participants 2 messages Dec 23, 2019 – Jan 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio: stregthen virtqueue size invariants

1. virtqueue_size is a power of 2
2. virtqueue_size > 2, since seg_max is virtqueue_size - 2

---
 hw/virtio/virtio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/virtio/virtio.c +2 -1
index 04716b5f6c..e3ab69061e 100644
@@ -2166,7 +2166,8 @@ void virtio_queue_set_num(VirtIODevice *vdev, int n, int num)
      */
     if (!!num != !!vdev->vq[n].vring.num ||
         num > VIRTQUEUE_MAX_SIZE ||
-        num < 0) {
+        num < 2 ||
+        !is_power_of_2(num)) {
         return;
     }
     vdev->vq[n].vring.num = num;
Signature · 1 line
2.17.0
#1 lore raw
Quoted 13 lines · Denis Plotnikov

1. virtqueue_size is a power of 2
2. virtqueue_size > 2, since seg_max is virtqueue_size - 2

---
 hw/virtio/virtio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/virtio/virtio.c +0 -0
index 04716b5f6c..e3ab69061e 100644

hw/virtio/virtio.c void virtio_queue_set_num(VirtIODevice *vdev, int n, int num) · line 2169

Quoted 5 lines
hw/virtio/virtio.c +1 -1
@@ -2166,7 +2166,8 @@ void virtio_queue_set_num(VirtIODevice *vdev, int n, int num)
      */
     if (!!num != !!vdev->vq[n].vring.num ||
         num > VIRTQUEUE_MAX_SIZE ||
-        num < 0) {
+        num < 2 ||

This is generic VIRTIO code so it's not possible to make assumptions about seg_max, which is a virtio-blk/scsi concept. Other VIRTIO devices may tolerate num < 2 just fine. Please drop this.

hw/virtio/virtio.c void virtio_queue_set_num(VirtIODevice *vdev, int n, int num) · line 2170

Quoted 1 line
hw/virtio/virtio.c +1 -0
+        !is_power_of_2(num)) {

This constraint only applies to the Split Virtqueue layout. Please see VIRTIO 1.1 "2.7.10.1 Structure Size and Alignment" for the Packed Virtqueue layout:

The Queue Size value does not have to be a power of 2.

The condition should be:

  !(virtio_has_features(vdev, VIRTIO_F_RING_PACKED) || is_power_of_2(num))