#define VIRTIO_USER_MEM_EVENT_CLB_NAME "virtio_user_mem_event_clb"
+const char * const virtio_user_backend_strings[] = {
+ [VIRTIO_USER_BACKEND_UNKNOWN] = "VIRTIO_USER_BACKEND_UNKNOWN",
+ [VIRTIO_USER_BACKEND_VHOST_USER] = "VHOST_USER",
+ [VIRTIO_USER_BACKEND_VHOST_KERNEL] = "VHOST_NET",
+ [VIRTIO_USER_BACKEND_VHOST_VDPA] = "VHOST_VDPA",
+};
+
static int
virtio_user_create_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
{
}
int
-virtio_user_start_device(struct virtio_user_dev *dev)
+virtio_user_dev_set_features(struct virtio_user_dev *dev)
{
uint64_t features;
- int ret;
+ int ret = -1;
- /*
- * XXX workaround!
- *
- * We need to make sure that the locks will be
- * taken in the correct order to avoid deadlocks.
- *
- * Before releasing this lock, this thread should
- * not trigger any memory hotplug events.
- *
- * This is a temporary workaround, and should be
- * replaced when we get proper supports from the
- * memory subsystem in the future.
- */
- rte_mcfg_mem_read_lock();
pthread_mutex_lock(&dev->mutex);
if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER &&
if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0)
goto error;
- /* Step 1: negotiate protocol features & set features */
features = dev->features;
-
/* Strip VIRTIO_NET_F_MAC, as MAC address is handled in vdev init */
features &= ~(1ull << VIRTIO_NET_F_MAC);
/* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */
if (ret < 0)
goto error;
PMD_DRV_LOG(INFO, "set features: %" PRIx64, features);
+error:
+ pthread_mutex_unlock(&dev->mutex);
+
+ return ret;
+}
+
+int
+virtio_user_start_device(struct virtio_user_dev *dev)
+{
+ int ret;
+
+ /*
+ * XXX workaround!
+ *
+ * We need to make sure that the locks will be
+ * taken in the correct order to avoid deadlocks.
+ *
+ * Before releasing this lock, this thread should
+ * not trigger any memory hotplug events.
+ *
+ * This is a temporary workaround, and should be
+ * replaced when we get proper supports from the
+ * memory subsystem in the future.
+ */
+ 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);
}
kickfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
if (kickfd < 0) {
+ close(callfd);
PMD_DRV_LOG(ERR, "kickfd error, %s", strerror(errno));
break;
}
}
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]);
}
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");
+ return -1;
}
}
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 (dev->device_features &
- (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) {
+ if ((dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) ||
+ (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)) {
if (dev->ops->send_request(dev,
VHOST_USER_GET_PROTOCOL_FEATURES,
&protocol_features))
* later.
*/
dev->device_features = VIRTIO_USER_SUPPORTED_FEATURES;
+
+ /* We cannot assume VHOST_USER_PROTOCOL_F_STATUS is supported
+ * until it's negotiated
+ */
+ dev->protocol_features &=
+ ~(1ULL << VHOST_USER_PROTOCOL_F_STATUS);
}
}
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;
+ pthread_mutex_lock(&dev->mutex);
+ dev->status = status;
if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)
ret = dev->ops->send_request(dev,
VHOST_USER_SET_STATUS, &arg);
ret = dev->ops->send_request(dev,
VHOST_USER_SET_STATUS, &status);
else
- return 0;
+ ret = -ENOTSUP;
- if (ret) {
+ if (ret && ret != -ENOTSUP) {
PMD_INIT_LOG(ERR, "VHOST_USER_SET_STATUS failed (%d): %s", ret,
strerror(errno));
- return -1;
}
- return 0;
+ 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;
uint8_t status;
int err;
+ pthread_mutex_lock(&dev->mutex);
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;
+ err = -1;
+ goto error;
}
status = ret;
err = dev->ops->send_request(dev, VHOST_USER_GET_STATUS,
&status);
} else {
- return 0;
+ err = -ENOTSUP;
}
- if (err) {
- PMD_INIT_LOG(ERR, "VHOST_USER_GET_STATUS failed (%d): %s", err,
- strerror(errno));
- return -1;
- }
-
- dev->status = status;
- PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):\n"
+ if (!err) {
+ dev->status = status;
+ PMD_INIT_LOG(DEBUG, "Updated Device Status(0x%08x):\n"
"\t-RESET: %u\n"
"\t-ACKNOWLEDGE: %u\n"
"\t-DRIVER: %u\n"
!!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK),
!!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET),
!!(dev->status & VIRTIO_CONFIG_STATUS_FAILED));
- return 0;
+ } else if (err != -ENOTSUP) {
+ PMD_INIT_LOG(ERR, "VHOST_USER_GET_STATUS failed (%d): %s", err,
+ strerror(errno));
+ }
+
+error:
+ pthread_mutex_unlock(&dev->mutex);
+ return err;
}