* pair.
*/
struct vhost_vring_file file;
+ int ret;
file.index = queue_sel;
file.fd = dev->callfds[queue_sel];
- dev->ops->send_request(dev, VHOST_USER_SET_VRING_CALL, &file);
+ ret = dev->ops->set_vring_call(dev, &file);
+ if (ret < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to create queue %u\n", dev->path, queue_sel);
+ return -1;
+ }
return 0;
}
static int
virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
{
+ int ret;
struct vhost_vring_file file;
struct vhost_vring_state state;
struct vring *vring = &dev->vrings[queue_sel];
state.index = queue_sel;
state.num = vring->num;
- dev->ops->send_request(dev, VHOST_USER_SET_VRING_NUM, &state);
+ ret = dev->ops->set_vring_num(dev, &state);
+ if (ret < 0)
+ goto err;
state.index = queue_sel;
state.num = 0; /* no reservation */
if (dev->features & (1ULL << VIRTIO_F_RING_PACKED))
state.num |= (1 << 15);
- dev->ops->send_request(dev, VHOST_USER_SET_VRING_BASE, &state);
+ ret = dev->ops->set_vring_base(dev, &state);
+ if (ret < 0)
+ goto err;
- dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);
+ ret = dev->ops->set_vring_addr(dev, &addr);
+ if (ret < 0)
+ goto err;
/* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes
* lastly because vhost depends on this msg to judge if
*/
file.index = queue_sel;
file.fd = dev->kickfds[queue_sel];
- dev->ops->send_request(dev, VHOST_USER_SET_VRING_KICK, &file);
+ ret = dev->ops->set_vring_kick(dev, &file);
+ if (ret < 0)
+ goto err;
return 0;
+err:
+ PMD_INIT_LOG(ERR, "(%s) Failed to kick queue %u\n", dev->path, queue_sel);
+
+ return -1;
}
static int
for (i = 0; i < dev->max_queue_pairs; ++i) {
queue_sel = 2 * i + VTNET_SQ_RQ_QUEUE_IDX;
if (fn(dev, queue_sel) < 0) {
- PMD_DRV_LOG(INFO, "setup rx vq fails: %u", i);
+ PMD_DRV_LOG(ERR, "(%s) setup rx vq %u failed", dev->path, i);
return -1;
}
}
for (i = 0; i < dev->max_queue_pairs; ++i) {
queue_sel = 2 * i + VTNET_SQ_TQ_QUEUE_IDX;
if (fn(dev, queue_sel) < 0) {
- PMD_DRV_LOG(INFO, "setup tx vq fails: %u", i);
+ PMD_DRV_LOG(INFO, "(%s) setup tx vq %u failed", dev->path, i);
return -1;
}
}
pthread_mutex_lock(&dev->mutex);
- if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER &&
- dev->vhostfd < 0)
- goto error;
-
/* Step 0: tell vhost to create queues */
if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0)
goto error;
/* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */
features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
features &= ~(1ull << VIRTIO_NET_F_STATUS);
- ret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features);
+ ret = dev->ops->set_features(dev, features);
if (ret < 0)
goto error;
- PMD_DRV_LOG(INFO, "set features: %" PRIx64, features);
+ PMD_DRV_LOG(INFO, "(%s) set features: 0x%" PRIx64, dev->path, features);
error:
pthread_mutex_unlock(&dev->mutex);
rte_mcfg_mem_read_lock();
pthread_mutex_lock(&dev->mutex);
- if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER &&
- dev->vhostfd < 0)
- goto error;
-
/* Step 2: share memory regions */
- ret = dev->ops->send_request(dev, VHOST_USER_SET_MEM_TABLE, NULL);
+ ret = dev->ops->set_memory_table(dev);
if (ret < 0)
goto error;
/* Step 3: kick queues */
- if (virtio_user_queue_setup(dev, virtio_user_kick_queue) < 0)
+ ret = virtio_user_queue_setup(dev, virtio_user_kick_queue);
+ if (ret < 0)
goto error;
/* Step 4: enable queues
* we enable the 1st queue pair by default.
*/
- dev->ops->enable_qp(dev, 0, 1);
+ ret = dev->ops->enable_qp(dev, 0, 1);
+ if (ret < 0)
+ goto error;
dev->started = true;
+
pthread_mutex_unlock(&dev->mutex);
rte_mcfg_mem_read_unlock();
error:
pthread_mutex_unlock(&dev->mutex);
rte_mcfg_mem_read_unlock();
+
+ PMD_INIT_LOG(ERR, "(%s) Failed to start device\n", dev->path);
+
/* TODO: free resource here or caller to check */
return -1;
}
{
struct vhost_vring_state state;
uint32_t i;
- int error = 0;
+ int ret;
pthread_mutex_lock(&dev->mutex);
if (!dev->started)
goto out;
- for (i = 0; i < dev->max_queue_pairs; ++i)
- dev->ops->enable_qp(dev, i, 0);
+ for (i = 0; i < dev->max_queue_pairs; ++i) {
+ ret = dev->ops->enable_qp(dev, i, 0);
+ if (ret < 0)
+ goto err;
+ }
/* 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;
+ ret = dev->ops->get_vring_base(dev, &state);
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "(%s) get_vring_base failed, index=%u", dev->path, i);
+ goto err;
}
}
dev->started = false;
+
out:
pthread_mutex_unlock(&dev->mutex);
- return error;
+ return 0;
+err:
+ pthread_mutex_unlock(&dev->mutex);
+
+ PMD_INIT_LOG(ERR, "(%s) Failed to stop device\n", dev->path);
+
+ return -1;
}
static inline void
*/
callfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
if (callfd < 0) {
- PMD_DRV_LOG(ERR, "callfd error, %s", strerror(errno));
+ PMD_DRV_LOG(ERR, "(%s) callfd error, %s", dev->path, strerror(errno));
break;
}
kickfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
if (kickfd < 0) {
- PMD_DRV_LOG(ERR, "kickfd error, %s", strerror(errno));
+ close(callfd);
+ PMD_DRV_LOG(ERR, "(%s) kickfd error, %s", dev->path, strerror(errno));
break;
}
dev->callfds[i] = callfd;
}
if (i < VIRTIO_MAX_VIRTQUEUES) {
- for (j = 0; j <= i; ++j) {
+ for (j = 0; j < i; ++j) {
close(dev->callfds[j]);
close(dev->kickfds[j]);
}
if (!eth_dev->intr_handle) {
eth_dev->intr_handle = malloc(sizeof(*eth_dev->intr_handle));
if (!eth_dev->intr_handle) {
- PMD_DRV_LOG(ERR, "fail to allocate intr_handle");
+ PMD_DRV_LOG(ERR, "(%s) failed to allocate intr_handle", dev->path);
return -1;
}
memset(eth_dev->intr_handle, 0, sizeof(*eth_dev->intr_handle));
struct virtio_user_dev *dev = arg;
struct rte_memseg_list *msl;
uint16_t i;
+ int ret = 0;
/* ignore externally allocated memory */
msl = rte_mem_virt2memseg_list(addr);
goto exit;
/* Step 1: pause the active queues */
- for (i = 0; i < dev->queue_pairs; i++)
- dev->ops->enable_qp(dev, i, 0);
+ for (i = 0; i < dev->queue_pairs; i++) {
+ ret = dev->ops->enable_qp(dev, i, 0);
+ if (ret < 0)
+ goto exit;
+ }
/* Step 2: update memory regions */
- dev->ops->send_request(dev, VHOST_USER_SET_MEM_TABLE, NULL);
+ ret = dev->ops->set_memory_table(dev);
+ if (ret < 0)
+ goto exit;
/* Step 3: resume the active queues */
- for (i = 0; i < dev->queue_pairs; i++)
- dev->ops->enable_qp(dev, i, 1);
+ for (i = 0; i < dev->queue_pairs; i++) {
+ ret = dev->ops->enable_qp(dev, i, 1);
+ if (ret < 0)
+ goto exit;
+ }
exit:
pthread_mutex_unlock(&dev->mutex);
+
+ if (ret < 0)
+ PMD_DRV_LOG(ERR, "(%s) Failed to update memory table\n", dev->path);
}
static int
PMD_DRV_LOG(ERR, "Server mode only supports vhost-user!");
return -1;
}
+ }
+
+ if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) {
dev->ops = &virtio_ops_user;
- } else {
- if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) {
- dev->ops = &virtio_ops_user;
- } else if (dev->backend_type ==
- VIRTIO_USER_BACKEND_VHOST_KERNEL) {
- dev->ops = &virtio_ops_kernel;
-
- dev->vhostfds = malloc(dev->max_queue_pairs *
- sizeof(int));
- dev->tapfds = malloc(dev->max_queue_pairs *
- sizeof(int));
- if (!dev->vhostfds || !dev->tapfds) {
- PMD_INIT_LOG(ERR, "Failed to malloc");
- return -1;
- }
-
- for (q = 0; q < dev->max_queue_pairs; ++q) {
- dev->vhostfds[q] = -1;
- dev->tapfds[q] = -1;
- }
- } else if (dev->backend_type ==
- VIRTIO_USER_BACKEND_VHOST_VDPA) {
- dev->ops = &virtio_ops_vdpa;
- } else {
- PMD_DRV_LOG(ERR, "Unknown backend type");
+ } else if (dev->backend_type ==
+ VIRTIO_USER_BACKEND_VHOST_KERNEL) {
+ dev->ops = &virtio_ops_kernel;
+
+ dev->vhostfds = malloc(dev->max_queue_pairs *
+ sizeof(int));
+ dev->tapfds = malloc(dev->max_queue_pairs *
+ sizeof(int));
+ if (!dev->vhostfds || !dev->tapfds) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to allocate FDs", dev->path);
return -1;
}
+
+ for (q = 0; q < dev->max_queue_pairs; ++q) {
+ dev->vhostfds[q] = -1;
+ dev->tapfds[q] = -1;
+ }
+ } else if (dev->backend_type ==
+ VIRTIO_USER_BACKEND_VHOST_VDPA) {
+ dev->ops = &virtio_ops_vdpa;
+ } else {
+ PMD_DRV_LOG(ERR, "(%s) Unknown backend type", dev->path);
+ return -1;
}
- if (dev->ops->setup(dev) < 0)
+
+ if (dev->ops->setup(dev) < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to setup backend\n", dev->path);
return -1;
+ }
- if (virtio_user_dev_init_notify(dev) < 0)
+ if (virtio_user_dev_init_notify(dev) < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to init notifiers\n", dev->path);
return -1;
+ }
- if (virtio_user_fill_intr_handle(dev) < 0)
+ if (virtio_user_fill_intr_handle(dev) < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to init interrupt handler\n", dev->path);
return -1;
+ }
return 0;
}
1ULL << VIRTIO_F_RING_PACKED | \
1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
-#define VIRTIO_USER_SUPPORTED_PROTOCOL_FEATURES \
+#define VHOST_USER_SUPPORTED_PROTOCOL_FEATURES \
(1ULL << VHOST_USER_PROTOCOL_F_MQ | \
1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK | \
1ULL << VHOST_USER_PROTOCOL_F_STATUS)
+#define VHOST_VDPA_SUPPORTED_PROTOCOL_FEATURES \
+ (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2 | \
+ 1ULL << VHOST_BACKEND_F_IOTLB_BATCH)
int
virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
int cq, int queue_size, const char *mac, char **ifname,
dev->mac_specified = 0;
dev->frontend_features = 0;
dev->unsupported_features = ~VIRTIO_USER_SUPPORTED_FEATURES;
- dev->protocol_features = VIRTIO_USER_SUPPORTED_PROTOCOL_FEATURES;
dev->backend_type = backend_type;
+ if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)
+ dev->protocol_features = VHOST_USER_SUPPORTED_PROTOCOL_FEATURES;
+ else if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)
+ dev->protocol_features = VHOST_VDPA_SUPPORTED_PROTOCOL_FEATURES;
+
parse_mac(dev, mac);
if (*ifname) {
}
if (virtio_user_dev_setup(dev) < 0) {
- PMD_INIT_LOG(ERR, "backend set up fails");
+ PMD_INIT_LOG(ERR, "(%s) backend set up fails", dev->path);
return -1;
}
dev->unsupported_features |=
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES);
- if (!dev->is_server) {
- if (dev->ops->send_request(dev, VHOST_USER_SET_OWNER,
- NULL) < 0) {
- PMD_INIT_LOG(ERR, "set_owner fails: %s",
- strerror(errno));
- return -1;
- }
+ if (dev->ops->set_owner(dev) < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to set backend owner", dev->path);
+ return -1;
+ }
+
+ if (dev->ops->get_features(dev, &dev->device_features) < 0) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to get backend features", dev->path);
+ return -1;
+ }
- if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,
- &dev->device_features) < 0) {
- PMD_INIT_LOG(ERR, "get_features failed: %s",
- strerror(errno));
+ if ((dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) ||
+ dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA) {
+ if (dev->ops->get_protocol_features(dev, &protocol_features)) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to get backend protocol features",
+ dev->path);
return -1;
}
+ dev->protocol_features &= protocol_features;
- if (dev->device_features &
- (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) {
- if (dev->ops->send_request(dev,
- VHOST_USER_GET_PROTOCOL_FEATURES,
- &protocol_features))
- return -1;
-
- dev->protocol_features &= protocol_features;
-
- if (dev->ops->send_request(dev,
- VHOST_USER_SET_PROTOCOL_FEATURES,
- &dev->protocol_features))
- return -1;
-
- if (!(dev->protocol_features &
- (1ULL << VHOST_USER_PROTOCOL_F_MQ)))
- dev->unsupported_features |=
- (1ull << VIRTIO_NET_F_MQ);
+ if (dev->ops->set_protocol_features(dev, dev->protocol_features)) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to set backend protocol features",
+ dev->path);
+ return -1;
}
- } else {
- /* We just pretend vhost-user can support all these features.
- * Note that this could be problematic that if some feature is
- * negotiated but not supported by the vhost-user which comes
- * later.
- */
- dev->device_features = VIRTIO_USER_SUPPORTED_FEATURES;
- }
-
+ if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ)))
+ dev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ);
+ }
if (!mrg_rxbuf)
dev->unsupported_features |= (1ull << VIRTIO_NET_F_MRG_RXBUF);
if (rte_mem_event_callback_register(VIRTIO_USER_MEM_EVENT_CLB_NAME,
virtio_user_mem_event_cb, dev)) {
if (rte_errno != ENOTSUP) {
- PMD_INIT_LOG(ERR, "Failed to register mem event"
- " callback\n");
+ PMD_INIT_LOG(ERR, "(%s) Failed to register mem event callback\n",
+ dev->path);
return -1;
}
}
uint8_t ret = 0;
if (q_pairs > dev->max_queue_pairs) {
- PMD_INIT_LOG(ERR, "multi-q config %u, but only %u supported",
- q_pairs, dev->max_queue_pairs);
+ PMD_INIT_LOG(ERR, "(%s) multi-q config %u, but only %u supported",
+ dev->path, q_pairs, dev->max_queue_pairs);
return -1;
}
}
int
-virtio_user_send_status_update(struct virtio_user_dev *dev, uint8_t status)
+virtio_user_dev_set_status(struct virtio_user_dev *dev, uint8_t status)
{
int ret;
- uint64_t arg = status;
- if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)
- ret = dev->ops->send_request(dev,
- VHOST_USER_SET_STATUS, &arg);
- else if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)
- ret = dev->ops->send_request(dev,
- VHOST_USER_SET_STATUS, &status);
- else
- ret = -ENOTSUP;
+ pthread_mutex_lock(&dev->mutex);
+ dev->status = status;
+ ret = dev->ops->set_status(dev, status);
+ if (ret && ret != -ENOTSUP)
+ PMD_INIT_LOG(ERR, "(%s) Failed to set backend status\n", dev->path);
- if (ret && ret != -ENOTSUP) {
- PMD_INIT_LOG(ERR, "VHOST_USER_SET_STATUS failed (%d): %s", ret,
- strerror(errno));
- }
+ pthread_mutex_unlock(&dev->mutex);
return ret;
}
int
-virtio_user_update_status(struct virtio_user_dev *dev)
+virtio_user_dev_update_status(struct virtio_user_dev *dev)
{
- uint64_t ret;
+ int ret;
uint8_t status;
- int err;
-
- if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) {
- err = dev->ops->send_request(dev, VHOST_USER_GET_STATUS, &ret);
- if (!err && ret > UINT8_MAX) {
- PMD_INIT_LOG(ERR, "Invalid VHOST_USER_GET_STATUS "
- "response 0x%" PRIx64 "\n", ret);
- return -1;
- }
- status = ret;
- } else if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA) {
- err = dev->ops->send_request(dev, VHOST_USER_GET_STATUS,
- &status);
- } else {
- err = -ENOTSUP;
- }
+ pthread_mutex_lock(&dev->mutex);
- if (!err) {
+ ret = dev->ops->get_status(dev, &status);
+ if (!ret) {
dev->status = status;
PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):\n"
"\t-RESET: %u\n"
!!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK),
!!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET),
!!(dev->status & VIRTIO_CONFIG_STATUS_FAILED));
- } else if (err != -ENOTSUP) {
- PMD_INIT_LOG(ERR, "VHOST_USER_GET_STATUS failed (%d): %s", err,
- strerror(errno));
+ } else if (ret != -ENOTSUP) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to get backend status\n", dev->path);
}
- return err;
+ pthread_mutex_unlock(&dev->mutex);
+ return ret;
}