vhost_net: don't set backend for the uninitialized virtqueue
PATCH v3 1/1 vhost_net: don't set backend for the uninitialized virtqueue
We used to set backend unconditionally, this won't work for some guests (e.g windows driver) who may not initialize all virtqueues. For kernel backend, this will fail since it may try to validate the rings during setting backend.
Fixing this by simply skipping the backend set when we find desc is not ready.
---
Changes from V1:
- introduce a generic helper to check if a virtqueue is enabled
--- hw/net/vhost_net.c | 10 ++++++++++ hw/virtio/virtio.c | 5 +++++ include/hw/virtio/virtio.h | 1 + 3 files changed, 16 insertions(+)
hw/net/vhost_net.c +10 -0
@@ -244,6 +244,11 @@ static int vhost_net_start_one(struct vhost_net *net,qemu_set_fd_handler (net->backend,NULL ,NULL ,NULL ); file.fd = net->backend;for (file.index =0 ; file.index < net->dev.nvqs; ++file.index) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + } r =vhost_net_set_backend (&net->dev, &file);if (r <0 ) { r = -errno;
@@ -256,6 +261,11 @@ fail: file.fd =-1 ;if (net->nc->info->type ==NET_CLIENT_DRIVER_TAP ) {while (file.index-- >0 ) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + }int r =vhost_net_set_backend (&net->dev, &file);assert (r >=0 ); }
hw/virtio/virtio.c +5 -0
@@ -2318,6 +2318,11 @@ hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n)return vdev->vq[n].vring.desc; } +bool virtio_queue_enabled (VirtIODevice *vdev,int n) +{ +return virtio_queue_get_desc_addr (vdev, n) !=0 ; +} +hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n) {return vdev->vq[n].vring.avail;
include/hw/virtio/virtio.h +1 -0
@@ -282,6 +282,7 @@ typedef struct VirtIORNGConf VirtIORNGConf; VIRTIO_F_IOMMU_PLATFORM, false)hwaddr virtio_queue_get_desc_addr (VirtIODevice *vdev,int n); +bool virtio_queue_enabled (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_used_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_desc_size (VirtIODevice *vdev,int n);
Signature · 1 line
2.19.1
Quoted 5 lines · Jason Wang
We used to set backend unconditionally, this won't work for some guests (e.g windows driver) who may not initialize all virtqueues. For kernel backend, this will fail since it may try to validate the rings during setting backend.
Quoted 8 lines
Fixing this by simply skipping the backend set when we find desc is not ready.
Signed-off-by Jason Wang <[email protected]>---
Changes from V1:
- introduce a generic helper to check if a virtqueue is enabled
---
Michael, does this look good to you?
Thanks
Quoted 61 lines
hw/net/vhost_net.c | 10 ++++++++++ hw/virtio/virtio.c | 5 +++++ include/hw/virtio/virtio.h | 1 + 3 files changed, 16 insertions(+)hw/net/vhost_net.c +10
-0@@ -244,6 +244,11 @@ static int vhost_net_start_one(struct vhost_net *net,qemu_set_fd_handler (net->backend,NULL ,NULL ,NULL ); file.fd = net->backend;for (file.index =0 ; file.index < net->dev.nvqs; ++file.index) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + } r =vhost_net_set_backend (&net->dev, &file);if (r <0 ) { r = -errno;@@ -256,6 +261,11 @@ fail: file.fd =-1 ;if (net->nc->info->type ==NET_CLIENT_DRIVER_TAP ) {while (file.index-- >0 ) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + }int r =vhost_net_set_backend (&net->dev, &file);assert (r >=0 ); }hw/virtio/virtio.c +5
-0@@ -2318,6 +2318,11 @@ hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n)return vdev->vq[n].vring.desc; } +bool virtio_queue_enabled (VirtIODevice *vdev,int n) +{ +return virtio_queue_get_desc_addr (vdev, n) !=0 ; +} +hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n) {return vdev->vq[n].vring.avail;include/hw/virtio/virtio.h +1
-0@@ -282,6 +282,7 @@ typedef struct VirtIORNGConf VirtIORNGConf; VIRTIO_F_IOMMU_PLATFORM, false)hwaddr virtio_queue_get_desc_addr (VirtIODevice *vdev,int n); +bool virtio_queue_enabled (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_used_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_desc_size (VirtIODevice *vdev,int n);
Quoted 9 lines · Jason Wang
We used to set backend unconditionally, this won't work for some guests (e.g windows driver) who may not initialize all virtqueues. For kernel backend, this will fail since it may try to validate the rings during setting backend.
Fixing this by simply skipping the backend set when we find desc is not ready.
Signed-off-by Jason Wang <[email protected]>
Quoted 67 lines
---
Changes from V1:
- introduce a generic helper to check if a virtqueue is enabled--- hw/net/vhost_net.c | 10 ++++++++++ hw/virtio/virtio.c | 5 +++++ include/hw/virtio/virtio.h | 1 + 3 files changed, 16 insertions(+)hw/net/vhost_net.c +10
-0@@ -244,6 +244,11 @@ static int vhost_net_start_one(struct vhost_net *net,qemu_set_fd_handler (net->backend,NULL ,NULL ,NULL ); file.fd = net->backend;for (file.index =0 ; file.index < net->dev.nvqs; ++file.index) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + } r =vhost_net_set_backend (&net->dev, &file);if (r <0 ) { r = -errno;@@ -256,6 +261,11 @@ fail: file.fd =-1 ;if (net->nc->info->type ==NET_CLIENT_DRIVER_TAP ) {while (file.index-- >0 ) { +if (!virtio_queue_enabled (dev, net->dev.vq_index + + file.index)) { +/* Queue might not be ready for start */ +continue ; + }int r =vhost_net_set_backend (&net->dev, &file);assert (r >=0 ); }hw/virtio/virtio.c +5
-0@@ -2318,6 +2318,11 @@ hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n)return vdev->vq[n].vring.desc; } +bool virtio_queue_enabled (VirtIODevice *vdev,int n) +{ +return virtio_queue_get_desc_addr (vdev, n) !=0 ; +} +hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n) {return vdev->vq[n].vring.avail;include/hw/virtio/virtio.h +1
-0@@ -282,6 +282,7 @@ typedef struct VirtIORNGConf VirtIORNGConf; VIRTIO_F_IOMMU_PLATFORM, false)hwaddr virtio_queue_get_desc_addr (VirtIODevice *vdev,int n); +bool virtio_queue_enabled (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_avail_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_used_addr (VirtIODevice *vdev,int n);hwaddr virtio_queue_get_desc_size (VirtIODevice *vdev,int n);Signature · 1 line
2.19.1
Jason Wang
AppliedQuoted 6 lines · Michael S. Tsirkin
Quoted 5 lines · Jason Wang
We used to set backend unconditionally, this won't work for some guests (e.g windows driver) who may not initialize all virtqueues. For kernel backend, this will fail since it may try to validate the rings during setting backend.
Quoted 6 lines
Quoted 4 lines
Fixing this by simply skipping the backend set when we find desc is not ready.
Signed-off-by Jason Wang<[email protected]>Reviewed-by Michael S. Tsirkin<[email protected]>
Applied.
Thanks