#include "rte_eth_vhost.h"
-static int vhost_logtype;
+RTE_LOG_REGISTER(vhost_logtype, pmd.net.vhost, NOTICE);
#define VHOST_LOG(level, ...) \
rte_log(RTE_LOG_ ## level, vhost_logtype, __VA_ARGS__)
#define ETH_VHOST_IOMMU_SUPPORT "iommu-support"
#define ETH_VHOST_POSTCOPY_SUPPORT "postcopy-support"
#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
+#define ETH_VHOST_LINEAR_BUF "linear-buffer"
+#define ETH_VHOST_EXT_BUF "ext-buffer"
#define VHOST_MAX_PKT_BURST 32
static const char *valid_arguments[] = {
ETH_VHOST_IOMMU_SUPPORT,
ETH_VHOST_POSTCOPY_SUPPORT,
ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
+ ETH_VHOST_LINEAR_BUF,
+ ETH_VHOST_EXT_BUF,
NULL
};
struct rte_mempool *mb_pool;
uint16_t port;
uint16_t virtqueue_id;
+ bool intr_en;
struct vhost_stats stats;
};
struct pmd_internal {
rte_atomic32_t dev_attached;
- char *dev_name;
char *iface_name;
+ uint64_t flags;
+ uint64_t disable_flags;
uint16_t max_queues;
int vid;
rte_atomic32_t started;
return nb_tx;
}
-static int
-eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
-{
- struct pmd_internal *internal = dev->data->dev_private;
- const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-
- internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
-
- return 0;
-}
-
static inline struct internal_list *
find_internal_resource(char *ifname)
{
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1);
rte_wmb();
+ vq->intr_en = true;
+
return ret;
}
rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0);
rte_wmb();
+ vq->intr_en = false;
+
return 0;
}
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
}
+static int
+vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id)
+{
+ struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf;
+ struct pmd_internal *internal = eth_dev->data->dev_private;
+ struct rte_vhost_vring vring;
+ struct vhost_queue *vq;
+ int rx_idx = vring_id % 2 ? (vring_id - 1) >> 1 : -1;
+ int ret = 0;
+
+ /*
+ * The vring kickfd may be changed after the new device notification.
+ * Update it when the vring state is updated.
+ */
+ if (rx_idx >= 0 && rx_idx < eth_dev->data->nb_rx_queues &&
+ rte_atomic32_read(&internal->dev_attached) &&
+ rte_atomic32_read(&internal->started) &&
+ dev_conf->intr_conf.rxq) {
+ vq = eth_dev->data->rx_queues[rx_idx];
+ ret = rte_vhost_get_vhost_vring(vid, vring_id, &vring);
+ if (!ret) {
+ if (vring.kickfd !=
+ eth_dev->intr_handle->efds[rx_idx]) {
+ VHOST_LOG(INFO,
+ "kickfd for rxq-%d was changed.\n",
+ rx_idx);
+ eth_dev->intr_handle->efds[rx_idx] =
+ vring.kickfd;
+ }
+
+ rte_vhost_enable_guest_notification(vid, vring_id,
+ vq->intr_en);
+ rte_wmb();
+ }
+ }
+
+ return ret;
+}
+
static int
vring_state_changed(int vid, uint16_t vring, int enable)
{
eth_dev = list->eth_dev;
/* won't be NULL */
state = vring_states[eth_dev->data->port_id];
+
+ if (enable && vring_conf_update(vid, eth_dev, vring))
+ VHOST_LOG(INFO, "Failed to update vring-%d configuration.\n",
+ (int)vring);
+
rte_spinlock_lock(&state->lock);
if (state->cur[vring] == enable) {
rte_spinlock_unlock(&state->lock);
.vring_state_changed = vring_state_changed,
};
+static int
+vhost_driver_setup(struct rte_eth_dev *eth_dev)
+{
+ struct pmd_internal *internal = eth_dev->data->dev_private;
+ struct internal_list *list = NULL;
+ struct rte_vhost_vring_state *vring_state = NULL;
+ unsigned int numa_node = eth_dev->device->numa_node;
+ const char *name = eth_dev->device->name;
+
+ /* Don't try to setup again if it has already been done. */
+ list = find_internal_resource(internal->iface_name);
+ if (list)
+ return 0;
+
+ list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
+ if (list == NULL)
+ return -1;
+
+ vring_state = rte_zmalloc_socket(name, sizeof(*vring_state),
+ 0, numa_node);
+ if (vring_state == NULL)
+ goto free_list;
+
+ list->eth_dev = eth_dev;
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_INSERT_TAIL(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+
+ rte_spinlock_init(&vring_state->lock);
+ vring_states[eth_dev->data->port_id] = vring_state;
+
+ if (rte_vhost_driver_register(internal->iface_name, internal->flags))
+ goto list_remove;
+
+ if (internal->disable_flags) {
+ if (rte_vhost_driver_disable_features(internal->iface_name,
+ internal->disable_flags))
+ goto drv_unreg;
+ }
+
+ if (rte_vhost_driver_callback_register(internal->iface_name,
+ &vhost_ops) < 0) {
+ VHOST_LOG(ERR, "Can't register callbacks\n");
+ goto drv_unreg;
+ }
+
+ if (rte_vhost_driver_start(internal->iface_name) < 0) {
+ VHOST_LOG(ERR, "Failed to start driver for %s\n",
+ internal->iface_name);
+ goto drv_unreg;
+ }
+
+ return 0;
+
+drv_unreg:
+ rte_vhost_driver_unregister(internal->iface_name);
+list_remove:
+ vring_states[eth_dev->data->port_id] = NULL;
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_REMOVE(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+ rte_free(vring_state);
+free_list:
+ rte_free(list);
+
+ return -1;
+}
+
int
rte_eth_vhost_get_queue_event(uint16_t port_id,
struct rte_eth_vhost_queue_event *event)
return vid;
}
+static int
+eth_dev_configure(struct rte_eth_dev *dev)
+{
+ struct pmd_internal *internal = dev->data->dev_private;
+ const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
+
+ /* NOTE: the same process has to operate a vhost interface
+ * from beginning to end (from eth_dev configure to eth_dev close).
+ * It is user's responsibility at the moment.
+ */
+ if (vhost_driver_setup(dev) < 0)
+ return -1;
+
+ internal->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
+
+ return 0;
+}
+
static int
eth_dev_start(struct rte_eth_dev *eth_dev)
{
eth_dev_stop(dev);
- rte_vhost_driver_unregister(internal->iface_name);
-
list = find_internal_resource(internal->iface_name);
- if (!list)
- return;
-
- pthread_mutex_lock(&internal_list_lock);
- TAILQ_REMOVE(&internal_list, list, next);
- pthread_mutex_unlock(&internal_list_lock);
- rte_free(list);
+ if (list) {
+ rte_vhost_driver_unregister(internal->iface_name);
+ pthread_mutex_lock(&internal_list_lock);
+ TAILQ_REMOVE(&internal_list, list, next);
+ pthread_mutex_unlock(&internal_list_lock);
+ rte_free(list);
+ }
if (dev->data->rx_queues)
for (i = 0; i < dev->data->nb_rx_queues; i++)
for (i = 0; i < dev->data->nb_tx_queues; i++)
rte_free(dev->data->tx_queues[i]);
- free(internal->dev_name);
rte_free(internal->iface_name);
rte_free(internal);
struct pmd_internal *internal = NULL;
struct rte_eth_dev *eth_dev = NULL;
struct rte_ether_addr *eth_addr = NULL;
- struct rte_vhost_vring_state *vring_state = NULL;
- struct internal_list *list = NULL;
VHOST_LOG(INFO, "Creating VHOST-USER backend on numa socket %u\n",
numa_node);
- list = rte_zmalloc_socket(name, sizeof(*list), 0, numa_node);
- if (list == NULL)
- goto error;
-
/* reserve an ethdev entry */
eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internal));
if (eth_dev == NULL)
*eth_addr = base_eth_addr;
eth_addr->addr_bytes[5] = eth_dev->data->port_id;
- vring_state = rte_zmalloc_socket(name,
- sizeof(*vring_state), 0, numa_node);
- if (vring_state == NULL)
- goto error;
-
/* now put it all together
* - store queue data in internal,
* - point eth_dev_data to internals
* - and point eth_dev structure to new eth_dev_data structure
*/
internal = eth_dev->data->dev_private;
- internal->dev_name = strdup(name);
- if (internal->dev_name == NULL)
- goto error;
internal->iface_name = rte_malloc_socket(name, strlen(iface_name) + 1,
0, numa_node);
if (internal->iface_name == NULL)
goto error;
strcpy(internal->iface_name, iface_name);
- list->eth_dev = eth_dev;
- pthread_mutex_lock(&internal_list_lock);
- TAILQ_INSERT_TAIL(&internal_list, list, next);
- pthread_mutex_unlock(&internal_list_lock);
-
- rte_spinlock_init(&vring_state->lock);
- vring_states[eth_dev->data->port_id] = vring_state;
-
data->nb_rx_queues = queues;
data->nb_tx_queues = queues;
internal->max_queues = queues;
internal->vid = -1;
+ internal->flags = flags;
+ internal->disable_flags = disable_flags;
data->dev_link = pmd_link;
data->dev_flags = RTE_ETH_DEV_INTR_LSC | RTE_ETH_DEV_CLOSE_REMOVE;
+ data->promiscuous = 1;
+ data->all_multicast = 1;
eth_dev->dev_ops = &ops;
eth_dev->rx_pkt_burst = eth_vhost_rx;
eth_dev->tx_pkt_burst = eth_vhost_tx;
- if (rte_vhost_driver_register(iface_name, flags))
- goto error;
-
- if (disable_flags) {
- if (rte_vhost_driver_disable_features(iface_name,
- disable_flags))
- goto error;
- }
-
- if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
- VHOST_LOG(ERR, "Can't register callbacks\n");
- goto error;
- }
-
- if (rte_vhost_driver_start(iface_name) < 0) {
- VHOST_LOG(ERR, "Failed to start driver for %s\n",
- iface_name);
- goto error;
- }
-
rte_eth_dev_probing_finish(eth_dev);
return 0;
error:
- if (internal) {
+ if (internal)
rte_free(internal->iface_name);
- free(internal->dev_name);
- }
- rte_free(vring_state);
rte_eth_dev_release_port(eth_dev);
- rte_free(list);
return -1;
}
int iommu_support = 0;
int postcopy_support = 0;
int tso = 0;
+ int linear_buf = 0;
+ int ext_buf = 0;
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
VHOST_LOG(ERR, "Failed to probe %s\n", name);
return -1;
}
- /* TODO: request info from primary to set up Rx and Tx */
+ eth_dev->rx_pkt_burst = eth_vhost_rx;
+ eth_dev->tx_pkt_burst = eth_vhost_tx;
eth_dev->dev_ops = &ops;
+ if (dev->device.numa_node == SOCKET_ID_ANY)
+ dev->device.numa_node = rte_socket_id();
eth_dev->device = &dev->device;
rte_eth_dev_probing_finish(eth_dev);
return 0;
}
}
+ if (rte_kvargs_count(kvlist, ETH_VHOST_LINEAR_BUF) == 1) {
+ ret = rte_kvargs_process(kvlist,
+ ETH_VHOST_LINEAR_BUF,
+ &open_int, &linear_buf);
+ if (ret < 0)
+ goto out_free;
+
+ if (linear_buf == 1)
+ flags |= RTE_VHOST_USER_LINEARBUF_SUPPORT;
+ }
+
+ if (rte_kvargs_count(kvlist, ETH_VHOST_EXT_BUF) == 1) {
+ ret = rte_kvargs_process(kvlist,
+ ETH_VHOST_EXT_BUF,
+ &open_int, &ext_buf);
+ if (ret < 0)
+ goto out_free;
+
+ if (ext_buf == 1)
+ flags |= RTE_VHOST_USER_EXTBUF_SUPPORT;
+ }
+
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
"dequeue-zero-copy=<0|1> "
"iommu-support=<0|1> "
"postcopy-support=<0|1> "
- "tso=<0|1>");
-
-RTE_INIT(vhost_init_log)
-{
- vhost_logtype = rte_log_register("pmd.net.vhost");
- if (vhost_logtype >= 0)
- rte_log_set_level(vhost_logtype, RTE_LOG_NOTICE);
-}
+ "tso=<0|1> "
+ "linear-buffer=<0|1> "
+ "ext-buffer=<0|1>");
git.droids-corp.org / dpdk.git / blobdiff