#include <sys/types.h>
#include <sys/stat.h>
+#include <rte_string_fns.h>
#include <rte_eal_memconfig.h>
#include "vhost.h"
#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)
{
* 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];
if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) {
addr.desc_user_addr =
- (uint64_t)(uintptr_t)pq_vring->desc_packed;
+ (uint64_t)(uintptr_t)pq_vring->desc;
addr.avail_user_addr =
- (uint64_t)(uintptr_t)pq_vring->driver_event;
+ (uint64_t)(uintptr_t)pq_vring->driver;
addr.used_user_addr =
- (uint64_t)(uintptr_t)pq_vring->device_event;
+ (uint64_t)(uintptr_t)pq_vring->device;
} else {
addr.desc_user_addr = (uint64_t)(uintptr_t)vring->desc;
addr.avail_user_addr = (uint64_t)(uintptr_t)vring->avail;
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;
}
}
}
int
-is_vhost_user_by_type(const char *path)
+virtio_user_dev_set_features(struct virtio_user_dev *dev)
{
- struct stat sb;
+ uint64_t features;
+ int ret = -1;
- if (stat(path, &sb) == -1)
- return 0;
+ pthread_mutex_lock(&dev->mutex);
- return S_ISSOCK(sb.st_mode);
+ /* Step 0: tell vhost to create queues */
+ if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0)
+ goto error;
+
+ 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 */
+ features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
+ features &= ~(1ull << VIRTIO_NET_F_STATUS);
+ ret = dev->ops->set_features(dev, features);
+ if (ret < 0)
+ goto error;
+ PMD_DRV_LOG(INFO, "(%s) set features: 0x%" PRIx64, dev->path, features);
+error:
+ pthread_mutex_unlock(&dev->mutex);
+
+ return ret;
}
int
virtio_user_start_device(struct virtio_user_dev *dev)
{
- struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
- uint64_t features;
int ret;
/*
* replaced when we get proper supports from the
* memory subsystem in the future.
*/
- rte_rwlock_read_lock(&mcfg->memory_hotplug_lock);
+ rte_mcfg_mem_read_lock();
pthread_mutex_lock(&dev->mutex);
- if (is_vhost_user_by_type(dev->path) && 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;
-
- /* Step 1: 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 */
- features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
- features &= ~(1ull << VIRTIO_NET_F_STATUS);
- ret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features);
- if (ret < 0)
- goto error;
- PMD_DRV_LOG(INFO, "set features: %" PRIx64, features);
-
/* 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_rwlock_read_unlock(&mcfg->memory_hotplug_lock);
+ rte_mcfg_mem_read_unlock();
return 0;
error:
pthread_mutex_unlock(&dev->mutex);
- rte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);
+ 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
parse_mac(struct virtio_user_dev *dev, const char *mac)
{
- int i, r;
- uint32_t tmp[ETHER_ADDR_LEN];
+ struct rte_ether_addr tmp;
if (!mac)
return;
- r = sscanf(mac, "%x:%x:%x:%x:%x:%x", &tmp[0],
- &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]);
- if (r == ETHER_ADDR_LEN) {
- for (i = 0; i < ETHER_ADDR_LEN; ++i)
- dev->mac_addr[i] = (uint8_t)tmp[i];
+ if (rte_ether_unformat_addr(mac, &tmp) == 0) {
+ memcpy(dev->mac_addr, &tmp, RTE_ETHER_ADDR_LEN);
dev->mac_specified = 1;
} else {
/* ignore the wrong mac, use random mac */
*/
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));
static void
virtio_user_mem_event_cb(enum rte_mem_event type __rte_unused,
- const void *addr __rte_unused,
- size_t len __rte_unused,
- void *arg)
+ const void *addr,
+ size_t len __rte_unused,
+ void *arg)
{
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
dev->tapfds = NULL;
if (dev->is_server) {
- if (access(dev->path, F_OK) == 0 &&
- !is_vhost_user_by_type(dev->path)) {
- PMD_DRV_LOG(ERR, "Server mode doesn't support vhost-kernel!");
+ if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER) {
+ 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 (is_vhost_user_by_type(dev->path)) {
- dev->ops = &virtio_ops_user;
- } else {
- 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_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_NET_F_GUEST_TSO6 | \
1ULL << VIRTIO_F_IN_ORDER | \
1ULL << VIRTIO_F_VERSION_1 | \
- 1ULL << VIRTIO_F_RING_PACKED)
+ 1ULL << VIRTIO_F_RING_PACKED | \
+ 1ULL << VHOST_USER_F_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,
- int mrg_rxbuf, int in_order, int packed_vq)
+ int server, int mrg_rxbuf, int in_order, int packed_vq,
+ enum virtio_user_backend_type backend_type)
{
+ uint64_t protocol_features = 0;
+
pthread_mutex_init(&dev->mutex, NULL);
- snprintf(dev->path, PATH_MAX, "%s", path);
+ strlcpy(dev->path, path, PATH_MAX);
dev->started = 0;
dev->max_queue_pairs = queues;
dev->queue_pairs = 1; /* mq disabled by default */
dev->queue_size = queue_size;
+ dev->is_server = server;
dev->mac_specified = 0;
dev->frontend_features = 0;
dev->unsupported_features = ~VIRTIO_USER_SUPPORTED_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;
}
- 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));
+ if (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER)
+ dev->unsupported_features |=
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES);
+
+ 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->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;
}
- if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,
- &dev->device_features) < 0) {
- PMD_INIT_LOG(ERR, "get_features failed: %s",
- strerror(errno));
+ dev->protocol_features &= protocol_features;
+
+ 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)
}
/* The backend will not report this feature, we add it explicitly */
- if (is_vhost_user_by_type(dev->path))
+ if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)
dev->frontend_features |= (1ull << VIRTIO_NET_F_STATUS);
/*
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;
}
}
close(dev->kickfds[i]);
}
- close(dev->vhostfd);
+ if (dev->vhostfd >= 0)
+ close(dev->vhostfd);
if (dev->is_server && dev->listenfd >= 0) {
close(dev->listenfd);
}
if (dev->vhostfds) {
- for (i = 0; i < dev->max_queue_pairs; ++i)
+ for (i = 0; i < dev->max_queue_pairs; ++i) {
close(dev->vhostfds[i]);
+ if (dev->tapfds[i] >= 0)
+ close(dev->tapfds[i]);
+ }
free(dev->vhostfds);
free(dev->tapfds);
}
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;
}
queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
status = virtio_user_handle_mq(dev, queues);
+ } else if (hdr->class == VIRTIO_NET_CTRL_RX ||
+ hdr->class == VIRTIO_NET_CTRL_MAC ||
+ hdr->class == VIRTIO_NET_CTRL_VLAN) {
+ status = 0;
}
/* Update status */
static inline int
desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)
{
- return wrap_counter == !!(desc->flags & VRING_DESC_F_AVAIL(1)) &&
- wrap_counter != !!(desc->flags & VRING_DESC_F_USED(1));
+ uint16_t flags = __atomic_load_n(&desc->flags, __ATOMIC_ACQUIRE);
+
+ return wrap_counter == !!(flags & VRING_PACKED_DESC_F_AVAIL) &&
+ wrap_counter != !!(flags & VRING_PACKED_DESC_F_USED);
}
static uint32_t
n_descs++;
idx_status = idx_data;
- while (vring->desc_packed[idx_status].flags & VRING_DESC_F_NEXT) {
+ while (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) {
idx_status++;
if (idx_status >= dev->queue_size)
idx_status -= dev->queue_size;
n_descs++;
}
- hdr = (void *)(uintptr_t)vring->desc_packed[idx_hdr].addr;
+ hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
if (hdr->class == VIRTIO_NET_CTRL_MQ &&
hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
uint16_t queues;
queues = *(uint16_t *)(uintptr_t)
- vring->desc_packed[idx_data].addr;
+ vring->desc[idx_data].addr;
status = virtio_user_handle_mq(dev, queues);
+ } else if (hdr->class == VIRTIO_NET_CTRL_RX ||
+ hdr->class == VIRTIO_NET_CTRL_MAC ||
+ hdr->class == VIRTIO_NET_CTRL_VLAN) {
+ status = 0;
}
/* Update status */
*(virtio_net_ctrl_ack *)(uintptr_t)
- vring->desc_packed[idx_status].addr = status;
+ vring->desc[idx_status].addr = status;
/* Update used descriptor */
- vring->desc_packed[idx_hdr].id = vring->desc_packed[idx_status].id;
- vring->desc_packed[idx_hdr].len = sizeof(status);
+ vring->desc[idx_hdr].id = vring->desc[idx_status].id;
+ vring->desc[idx_hdr].len = sizeof(status);
return n_descs;
}
{
struct virtio_user_queue *vq = &dev->packed_queues[queue_idx];
struct vring_packed *vring = &dev->packed_vrings[queue_idx];
- uint16_t n_descs;
+ uint16_t n_descs, flags;
- while (desc_is_avail(&vring->desc_packed[vq->used_idx],
+ /* Perform a load-acquire barrier in desc_is_avail to
+ * enforce the ordering between desc flags and desc
+ * content.
+ */
+ while (desc_is_avail(&vring->desc[vq->used_idx],
vq->used_wrap_counter)) {
n_descs = virtio_user_handle_ctrl_msg_packed(dev, vring,
vq->used_idx);
- rte_smp_wmb();
- vring->desc_packed[vq->used_idx].flags =
- VRING_DESC_F_WRITE |
- VRING_DESC_F_AVAIL(vq->used_wrap_counter) |
- VRING_DESC_F_USED(vq->used_wrap_counter);
+ flags = VRING_DESC_F_WRITE;
+ if (vq->used_wrap_counter)
+ flags |= VRING_PACKED_DESC_F_AVAIL_USED;
+
+ __atomic_store_n(&vring->desc[vq->used_idx].flags, flags,
+ __ATOMIC_RELEASE);
vq->used_idx += n_descs;
if (vq->used_idx >= dev->queue_size) {
struct vring *vring = &dev->vrings[queue_idx];
/* Consume avail ring, using used ring idx as first one */
- while (vring->used->idx != vring->avail->idx) {
- avail_idx = (vring->used->idx) & (vring->num - 1);
+ while (__atomic_load_n(&vring->used->idx, __ATOMIC_RELAXED)
+ != vring->avail->idx) {
+ avail_idx = __atomic_load_n(&vring->used->idx, __ATOMIC_RELAXED)
+ & (vring->num - 1);
desc_idx = vring->avail->ring[avail_idx];
n_descs = virtio_user_handle_ctrl_msg(dev, vring, desc_idx);
uep->id = desc_idx;
uep->len = n_descs;
- vring->used->idx++;
+ __atomic_add_fetch(&vring->used->idx, 1, __ATOMIC_RELAXED);
}
}
+
+int
+virtio_user_dev_set_status(struct virtio_user_dev *dev, uint8_t status)
+{
+ int ret;
+
+ 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);
+
+ pthread_mutex_unlock(&dev->mutex);
+ return ret;
+}
+
+int
+virtio_user_dev_update_status(struct virtio_user_dev *dev)
+{
+ int ret;
+ uint8_t status;
+
+ pthread_mutex_lock(&dev->mutex);
+
+ 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"
+ "\t-ACKNOWLEDGE: %u\n"
+ "\t-DRIVER: %u\n"
+ "\t-DRIVER_OK: %u\n"
+ "\t-FEATURES_OK: %u\n"
+ "\t-DEVICE_NEED_RESET: %u\n"
+ "\t-FAILED: %u\n",
+ dev->status,
+ (dev->status == VIRTIO_CONFIG_STATUS_RESET),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_ACK),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_DRIVER_OK),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_DEV_NEED_RESET),
+ !!(dev->status & VIRTIO_CONFIG_STATUS_FAILED));
+ } else if (ret != -ENOTSUP) {
+ PMD_INIT_LOG(ERR, "(%s) Failed to get backend status\n", dev->path);
+ }
+
+ pthread_mutex_unlock(&dev->mutex);
+ return ret;
+}
git.droids-corp.org / dpdk.git / blobdiff