d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/virtio-user: do not reset owner when driver resets

Browse Source 
When driver resets the device, virtio-user just needs to send
GET_VRING_BASE messages to stop the vhost backend, and that's
what QEMU does. With this change, we won't need to set owner
when starting virtio-user device anymore. This will help us to
get rid of below error message on startup:

vhost_kernel_ioctl(): VHOST_SET_OWNER failed: Device or resource busy

Fixes: bce7e9050f9b ("net/virtio-user: fix start with kernel vhost")
Fixes: 0d6a8752ac9d ("net/virtio-user: fix crash as features change")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Tiwei Bie 2018-10-29 13:28:05 +08:00 committed by Ferruh Yigit
parent 86d4b06184
commit 74dc6746a0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/virtio/virtio_user/virtio_user_dev.c
View File

@ -134,9 +134,6 @@ virtio_user_start_device(struct virtio_user_dev *dev)
if (is_vhost_user_by_type(dev->path) && dev->vhostfd < 0)
goto error;
/* Do not check return as already done in init, or reset in stop */
dev->ops->send_request(dev, VHOST_USER_SET_OWNER, NULL);
/* Step 0: tell vhost to create queues */
if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0)
goto error;
@ -181,7 +178,9 @@ error:
int virtio_user_stop_device(struct virtio_user_dev *dev)
{
struct vhost_vring_state state;
uint32_t i;
int error = 0;
pthread_mutex_lock(&dev->mutex);
if (!dev->started)
@ -190,16 +189,23 @@ 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");
pthread_mutex_unlock(&dev->mutex);
return -1;
/* Stop the backend. */
for (i = 0; i < dev->max_queue_pairs * 2; ++i) {
state.index = i;
if (dev->ops->send_request(dev, VHOST_USER_GET_VRING_BASE,
&state) < 0) {
PMD_DRV_LOG(ERR, "get_vring_base failed, index=%u\n",
i);
error = -1;
goto out;
}
}
dev->started = false;
out:
pthread_mutex_unlock(&dev->mutex);
return 0;
return error;
}
static inline void