Skip to contentSkip to conversation

virtio-pci: fix queue_enable write

PATCH In review Jason Wang 4 participants 6 messages Jun 10, 2020 – Jun 11, 2020

lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH v2 1/1 virtio-pci: fix queue_enable write

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
 hw/virtio/virtio-pci.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
hw/virtio/virtio-pci.c +8 -4
index d028c17c24..7bc8c1c056 100644
@@ -1273,16 +1273,20 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
         virtio_queue_set_vector(vdev, vdev->queue_sel, val);
         break;
     case VIRTIO_PCI_COMMON_Q_ENABLE:
-        virtio_queue_set_num(vdev, vdev->queue_sel,
-                             proxy->vqs[vdev->queue_sel].num);
-        virtio_queue_set_rings(vdev, vdev->queue_sel,
+        if (val == 1) {
+            virtio_queue_set_num(vdev, vdev->queue_sel,
+                                 proxy->vqs[vdev->queue_sel].num);
+            virtio_queue_set_rings(vdev, vdev->queue_sel,
                        ((uint64_t)proxy->vqs[vdev->queue_sel].desc[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].desc[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].avail[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].avail[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].used[0]);
-        proxy->vqs[vdev->queue_sel].enabled = 1;
+            proxy->vqs[vdev->queue_sel].enabled = 1;
+        } else {
+            virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
+        }
         break;
     case VIRTIO_PCI_COMMON_Q_DESCLO:
         proxy->vqs[vdev->queue_sel].desc[0] = val;
Signature · 1 line
2.20.1
#1 lore raw
Quoted 22 lines · Jason Wang

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
 hw/virtio/virtio-pci.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
hw/virtio/virtio-pci.c +0 -0
index d028c17c24..7bc8c1c056 100644

hw/virtio/virtio-pci.c static void virtio_pci_common_write(void *opaque, hwaddr addr, · line 1276

Quoted 7 lines
hw/virtio/virtio-pci.c +1 -3
@@ -1273,16 +1273,20 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
         virtio_queue_set_vector(vdev, vdev->queue_sel, val);
         break;
     case VIRTIO_PCI_COMMON_Q_ENABLE:
-        virtio_queue_set_num(vdev, vdev->queue_sel,
-                             proxy->vqs[vdev->queue_sel].num);
-        virtio_queue_set_rings(vdev, vdev->queue_sel,
+        if (val == 1) {

Does it have to be 1 or can it be any value other than 0?

Thanks,
Stefano

Quoted 21 lines
hw/virtio/virtio-pci.c +7 -1
+            virtio_queue_set_num(vdev, vdev->queue_sel,
+                                 proxy->vqs[vdev->queue_sel].num);
+            virtio_queue_set_rings(vdev, vdev->queue_sel,
                        ((uint64_t)proxy->vqs[vdev->queue_sel].desc[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].desc[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].avail[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].avail[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].used[0]);
-        proxy->vqs[vdev->queue_sel].enabled = 1;
+            proxy->vqs[vdev->queue_sel].enabled = 1;
+        } else {
+            virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
+        }
         break;
     case VIRTIO_PCI_COMMON_Q_DESCLO:
         proxy->vqs[vdev->queue_sel].desc[0] = val;
Signature · 1 line
2.20.1
#2 lore raw
Quoted 33 lines · Stefano Garzarella
Quoted 22 lines · Jason Wang

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
 hw/virtio/virtio-pci.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
hw/virtio/virtio-pci.c +0 -0
index d028c17c24..7bc8c1c056 100644

hw/virtio/virtio-pci.c static void virtio_pci_common_write(void *opaque, hwaddr addr, · line 1276

Quoted 7 lines
hw/virtio/virtio-pci.c +1 -3
@@ -1273,16 +1273,20 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
         virtio_queue_set_vector(vdev, vdev->queue_sel, val);
         break;
     case VIRTIO_PCI_COMMON_Q_ENABLE:
-        virtio_queue_set_num(vdev, vdev->queue_sel,
-                             proxy->vqs[vdev->queue_sel].num);
-        virtio_queue_set_rings(vdev, vdev->queue_sel,
+        if (val == 1) {

Does it have to be 1 or can it be any value other than 0?

Quoted 2 lines

Thanks,
Stefano

spec says 1

Quoted 21 lines
Quoted 21 lines
hw/virtio/virtio-pci.c +7 -1
+            virtio_queue_set_num(vdev, vdev->queue_sel,
+                                 proxy->vqs[vdev->queue_sel].num);
+            virtio_queue_set_rings(vdev, vdev->queue_sel,
                        ((uint64_t)proxy->vqs[vdev->queue_sel].desc[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].desc[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].avail[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].avail[0],
                        ((uint64_t)proxy->vqs[vdev->queue_sel].used[1]) << 32 |
                        proxy->vqs[vdev->queue_sel].used[0]);
-        proxy->vqs[vdev->queue_sel].enabled = 1;
+            proxy->vqs[vdev->queue_sel].enabled = 1;
+        } else {
+            virtio_error(vdev, "wrong value for queue_enable %"PRIx64, val);
+        }
         break;
     case VIRTIO_PCI_COMMON_Q_DESCLO:
         proxy->vqs[vdev->queue_sel].desc[0] = val;
Signature · 1 line
2.20.1
Reviewed-by
#3 lore raw
Quoted 34 lines · Michael S. Tsirkin
Quoted 33 lines · Stefano Garzarella
Quoted 22 lines · Jason Wang

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
 hw/virtio/virtio-pci.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
hw/virtio/virtio-pci.c +0 -0
index d028c17c24..7bc8c1c056 100644

hw/virtio/virtio-pci.c static void virtio_pci_common_write(void *opaque, hwaddr addr, · line 1276

Quoted 7 lines
hw/virtio/virtio-pci.c +1 -3
@@ -1273,16 +1273,20 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
         virtio_queue_set_vector(vdev, vdev->queue_sel, val);
         break;
     case VIRTIO_PCI_COMMON_Q_ENABLE:
-        virtio_queue_set_num(vdev, vdev->queue_sel,
-                             proxy->vqs[vdev->queue_sel].num);
-        virtio_queue_set_rings(vdev, vdev->queue_sel,
+        if (val == 1) {

Does it have to be 1 or can it be any value other than 0?

Quoted 4 lines
Quoted 2 lines

Thanks,
Stefano

spec says 1

I was confused by "The driver MUST NOT write a 0 to queue_enable.", interpreting it as "can write anything other than 0".

But as Jason also wrote in the commit message, the driver should write 1 to enable, so

Thanks,
Stefano

author
#4 lore raw
Quoted 34 lines · Stefano Garzarella
Quoted 33 lines · Michael S. Tsirkin
Quoted 32 lines · Stefano Garzarella
Quoted 22 lines · Jason Wang

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
  hw/virtio/virtio-pci.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
hw/virtio/virtio-pci.c +0 -0
index d028c17c24..7bc8c1c056 100644

hw/virtio/virtio-pci.c static void virtio_pci_common_write(void *opaque, hwaddr addr, · line 1276

Quoted 7 lines
hw/virtio/virtio-pci.c +1 -3
@@ -1273,16 +1273,20 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
          virtio_queue_set_vector(vdev, vdev->queue_sel, val);
          break;
      case VIRTIO_PCI_COMMON_Q_ENABLE:
-        virtio_queue_set_num(vdev, vdev->queue_sel,
-                             proxy->vqs[vdev->queue_sel].num);
-        virtio_queue_set_rings(vdev, vdev->queue_sel,
+        if (val == 1) {

Does it have to be 1 or can it be any value other than 0?

Quoted 5 lines
Quoted 3 lines
Quoted 2 lines

Thanks,
Stefano

spec says 1

I was confused by "The driver MUST NOT write a 0 to queue_enable.", interpreting it as "can write anything other than 0".

Yes, the spec is unclear about what happens if we write a value other than 0 or 1.

Maybe we should clarify that only 1 is allowed. Or writing value other than 1 may cause unexpected result.

Quoted 5 lines

But as Jason also wrote in the commit message, the driver should write 1 to enable, so

Thanks

Quoted 4 lines

Thanks,
Stefano

Reviewed-by on v2 1/1
#5 lore raw
In reply to Jason Wang
Quoted 8 lines · Jason Wang

Spec said: The driver uses this to selectively prevent the device from executing requests from this virtqueue. 1 - enabled; 0 - disabled.

Though write 0 to queue_enable is forbidden by the spec, we should not assume that the value is 1.

Fix this by ignore the write value other than 1.

Quoted 8 lines

---
Changes from V1:
- fix typo
- warn wrong value through virtio_error

---
 hw/virtio/virtio-pci.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)