Fix the init path of generic vhost-vdpa device
cover Fix the init path of generic vhost-vdpa device
From: Longpeng <[email protected]>
The generic vhost-vdpa device and the commit a585fad26b ("vdpa: request iova_range only once") are merged in the same pull request, and the later would cause the generic vhost-vdpa device work improperly.
Patch 1 fixes the problem and patch 2 hardens the error path of vdpa/net.
Longpeng (Mike) (2):
vdpa-dev: get iova range explicitly
vdpa: harden the error path if get_iova_range failed
hw/virtio/vdpa-dev.c | 9 +++++++++ hw/virtio/vhost-vdpa.c | 7 +++++++ include/hw/virtio/vhost-vdpa.h | 2 ++ net/vhost-vdpa.c | 16 +++++++--------- 4 files changed, 25 insertions(+), 9 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/2 vdpa-dev: get iova range explicitly
From: Longpeng <[email protected]>
In commit a585fad26b ("vdpa: request iova_range only once") we remove GET_IOVA_RANGE form vhost_vdpa_init, the generic vdpa device will start without iova_range populated, so the device won't work. Let's call GET_IOVA_RANGE ioctl explicitly.
--- hw/virtio/vdpa-dev.c | 9 +++++++++ hw/virtio/vhost-vdpa.c | 7 +++++++ include/hw/virtio/vhost-vdpa.h | 2 ++ net/vhost-vdpa.c | 8 -------- 4 files changed, 18 insertions(+), 8 deletions(-)
hw/virtio/vdpa-dev.c +9 -0
@@ -53,6 +53,7 @@ static void vhost_vdpa_device_realize(DeviceState *dev, Error **errp) {VirtIODevice *vdev =VIRTIO_DEVICE (dev);VhostVdpaDevice *v =VHOST_VDPA_DEVICE (vdev); +struct vhost_vdpa_iova_range iova_range;uint16_t max_queue_size;struct vhost_virtqueue *vqs;int i, ret;
@@ -108,6 +109,14 @@ static void vhost_vdpa_device_realize(DeviceState *dev, Error **errp) v->dev.backend_features =0 ; v->started = false; + ret =vhost_vdpa_get_iova_range (v->vhostfd, &iova_range); +if (ret <0 ) { +error_setg (errp,"vhost-vdpa-device: get iova range failed: %s" , +strerror (-ret)); + goto free_vqs; + } + v->vdpa.iova_range = iova_range; + ret =vhost_dev_init (&v->dev, &v->vdpa,VHOST_BACKEND_TYPE_VDPA ,0 ,NULL );if (ret <0 ) { error_setg(errp, "vhost-vdpa-device: vhost initialization failed: %s",
hw/virtio/vhost-vdpa.c +7 -0
@@ -378,6 +378,13 @@ static int vhost_vdpa_add_status(struct vhost_dev *dev, uint8_t status)return 0 ; } +int vhost_vdpa_get_iova_range (int fd,struct vhost_vdpa_iova_range *iova_range) +{ +int ret =ioctl (fd,VHOST_VDPA_GET_IOVA_RANGE , iova_range); + +return ret <0 ? -errno :0 ; +} +/* * The use of this function is for requests that only need to be * applied once. Typically such request occurs at the beginning
include/hw/virtio/vhost-vdpa.h +2 -0
@@ -51,6 +51,8 @@ typedef struct vhost_vdpa {VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX ]; } VhostVDPA; +int vhost_vdpa_get_iova_range (int fd,struct vhost_vdpa_iova_range *iova_range); +int vhost_vdpa_dma_map (struct vhost_vdpa *v,uint32_t asid,hwaddr iova,hwaddr size,void *vaddr,bool readonly); int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, uint32_t asid, hwaddr iova,
net/vhost-vdpa.c +0 -8
@@ -702,14 +702,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,return nc; } -static int vhost_vdpa_get_iova_range (int fd, -struct vhost_vdpa_iova_range *iova_range) -{ -int ret =ioctl (fd,VHOST_VDPA_GET_IOVA_RANGE , iova_range); - -return ret <0 ? -errno :0 ; -} -static int vhost_vdpa_get_features (int fd,uint64_t *features,Error **errp) {int ret =ioctl (fd,VHOST_GET_FEATURES , features);
Signature · 1 line
2.23.0
Re: [PATCH 1/2] vdpa-dev: get iova range explicitly
Quoted 7 lines · Longpeng(Mike)
From: Longpeng <[email protected]>
In commit
a585fad26b("vdpa: requestiova_rangeonly once") we removeGET_IOVA_RANGEformvhost_vdpa_init, the generic vdpa device will start withoutiova_rangepopulated, so the device won't work. Let's callGET_IOVA_RANGEioctl explicitly.
Thanks
Quoted 90 lines
Fixes a585fad26b2e6ccc ("vdpa: request iova_range only once")Signed-off-by Longpeng <[email protected]>--- hw/virtio/vdpa-dev.c | 9 +++++++++ hw/virtio/vhost-vdpa.c | 7 +++++++ include/hw/virtio/vhost-vdpa.h | 2 ++ net/vhost-vdpa.c | 8 -------- 4 files changed, 18 insertions(+), 8 deletions(-)hw/virtio/vdpa-dev.c +9
-0@@ -53,6 +53,7 @@ static void vhost_vdpa_device_realize(DeviceState *dev, Error **errp) {VirtIODevice *vdev =VIRTIO_DEVICE (dev);VhostVdpaDevice *v =VHOST_VDPA_DEVICE (vdev); +struct vhost_vdpa_iova_range iova_range;uint16_t max_queue_size;struct vhost_virtqueue *vqs;int i, ret;@@ -108,6 +109,14 @@ static void vhost_vdpa_device_realize(DeviceState *dev, Error **errp) v->dev.backend_features =0 ; v->started = false; + ret =vhost_vdpa_get_iova_range (v->vhostfd, &iova_range); +if (ret <0 ) { +error_setg (errp,"vhost-vdpa-device: get iova range failed: %s" , +strerror (-ret)); + goto free_vqs; + } + v->vdpa.iova_range = iova_range; + ret =vhost_dev_init (&v->dev, &v->vdpa,VHOST_BACKEND_TYPE_VDPA ,0 ,NULL );if (ret <0 ) { error_setg(errp, "vhost-vdpa-device: vhost initialization failed: %s",hw/virtio/vhost-vdpa.c +7
-0@@ -378,6 +378,13 @@ static int vhost_vdpa_add_status(struct vhost_dev *dev, uint8_t status)return 0 ; } +int vhost_vdpa_get_iova_range (int fd,struct vhost_vdpa_iova_range *iova_range) +{ +int ret =ioctl (fd,VHOST_VDPA_GET_IOVA_RANGE , iova_range); + +return ret <0 ? -errno :0 ; +} +/* * The use of this function is for requests that only need to be * applied once. Typically such request occurs at the beginning include/hw/virtio/vhost-vdpa.h +2
-0@@ -51,6 +51,8 @@ typedef struct vhost_vdpa {VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX ]; } VhostVDPA; +int vhost_vdpa_get_iova_range (int fd,struct vhost_vdpa_iova_range *iova_range); +int vhost_vdpa_dma_map (struct vhost_vdpa *v,uint32_t asid,hwaddr iova,hwaddr size,void *vaddr,bool readonly); int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, uint32_t asid, hwaddr iova,net/vhost-vdpa.c +0
-9@@ -702,14 +702,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,return nc; } -static int vhost_vdpa_get_iova_range (int fd, -struct vhost_vdpa_iova_range *iova_range) -{ -int ret =ioctl (fd,VHOST_VDPA_GET_IOVA_RANGE , iova_range); - -return ret <0 ? -errno :0 ; -} -static int vhost_vdpa_get_features (int fd,uint64_t *features,Error **errp) {int ret =ioctl (fd,VHOST_GET_FEATURES , features); --2.23.0
PATCH 2/2 vdpa: harden the error path if get_iova_range failed
In reply to Longpeng(Mike) viaFrom: Longpeng <[email protected]>
We should stop if the GET_IOVA_RANGE ioctl failed.
--- net/vhost-vdpa.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/vhost-vdpa.c +7 -1
@@ -797,7 +797,13 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,return queue_pairs; } -vhost_vdpa_get_iova_range (vdpa_device_fd, &iova_range); + r =vhost_vdpa_get_iova_range (vdpa_device_fd, &iova_range); +if (unlikely (r <0 )) { +error_setg (errp,"vhost-vdpa: get iova range failed: %s" , +strerror (-r)); + goto err; + } +if (opts->x_svq) {if (!vhost_vdpa_net_valid_svq_features (features, errp)) { goto err_svq;
Signature · 1 line
2.23.0
Re: [PATCH 2/2] vdpa: harden the error path if get_iova_range failed
Quoted 4 lines · Longpeng(Mike)
From: Longpeng <[email protected]>
We should stop if the
GET_IOVA_RANGEioctl failed.
Thanks
Quoted 28 lines
Signed-off-by Longpeng <[email protected]>--- net/vhost-vdpa.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)net/vhost-vdpa.c +7
-2@@ -797,7 +797,13 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,return queue_pairs; } -vhost_vdpa_get_iova_range (vdpa_device_fd, &iova_range); + r =vhost_vdpa_get_iova_range (vdpa_device_fd, &iova_range); +if (unlikely (r <0 )) { +error_setg (errp,"vhost-vdpa: get iova range failed: %s" , +strerror (-r)); + goto err; + } +if (opts->x_svq) {if (!vhost_vdpa_net_valid_svq_features (features, errp)) { goto err_svq; --2.23.0