[dpdk-dev] net/virtio-user: fix segfault as features change
Checks
Commit Message
Since commit 59fe5e17d93 ("vhost: propagate set features handling error"),
vhost does not allow to set different features without reset.
The virito-user driver fails to reset the device in below commit.
To fix, we send the reset message as stopping the device.
Fixes: c12a26ee209e ("net/virtio-user: fix not properly reset device")
Reported-by: Lei Yao <lei.a.yao@intel.com>
Reported-by: Tiwei Bie <tiwei.bie@intel.com>
Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 5 +++++
1 file changed, 5 insertions(+)
Comments
Correct yuanhan's email :-)
> -----Original Message-----
> From: Tan, Jianfeng
> Sent: Tuesday, January 23, 2018 5:47 PM
> To: dev@dpdk.org
> Cc: yuanhan.liu@linux.intel.com; maxime.coquelin@redhat.com; Tan,
> Jianfeng
> Subject: [PATCH] net/virtio-user: fix segfault as features change
>
> Since commit 59fe5e17d93 ("vhost: propagate set features handling error"),
> vhost does not allow to set different features without reset.
>
> The virito-user driver fails to reset the device in below commit.
>
> To fix, we send the reset message as stopping the device.
>
> Fixes: c12a26ee209e ("net/virtio-user: fix not properly reset device")
>
> Reported-by: Lei Yao <lei.a.yao@intel.com>
> Reported-by: Tiwei Bie <tiwei.bie@intel.com>
> Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
> ---
> drivers/net/virtio/virtio_user/virtio_user_dev.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 7a70c18..3b5f737 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -142,6 +142,11 @@ int virtio_user_stop_device(struct virtio_user_dev
> *dev)
> for (i = 0; i < dev->max_queue_pairs; ++i)
> dev->ops->enable_qp(dev, i, 0);
>
> + if (dev->ops->send_request(dev, VHOST_USER_RESET_OWNER,
> NULL) < 0) {
> + PMD_DRV_LOG(INFO, "Failed to reset the device\n");
> + return -1;
> + }
> +
> return 0;
> }
>
> --
> 2.7.4
@@ -142,6 +142,11 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
for (i = 0; i < dev->max_queue_pairs; ++i)
dev->ops->enable_qp(dev, i, 0);
+ if (dev->ops->send_request(dev, VHOST_USER_RESET_OWNER, NULL) < 0) {
+ PMD_DRV_LOG(INFO, "Failed to reset the device\n");
+ return -1;
+ }
+
return 0;
}