static const char *virtual_ethdev_driver_name = "Virtual PMD";
struct virtual_ethdev_private {
+ struct eth_dev_ops dev_ops;
struct rte_eth_stats eth_stats;
struct rte_ring *rx_queue;
}
static void virtual_ethdev_stop(struct rte_eth_dev *eth_dev __rte_unused)
{
- struct rte_mbuf *pkt = NULL;
+ void *pkt = NULL;
struct virtual_ethdev_private *prv = eth_dev->data->dev_private;
eth_dev->data->dev_link.link_status = 0;
eth_dev->data->dev_started = 0;
- while (rte_ring_dequeue(prv->rx_queue, (void **)&pkt) != -ENOENT)
+ while (rte_ring_dequeue(prv->rx_queue, &pkt) != -ENOENT)
rte_pktmbuf_free(pkt);
- while (rte_ring_dequeue(prv->tx_queue, (void **)&pkt) != -ENOENT)
+ while (rte_ring_dequeue(prv->tx_queue, &pkt) != -ENOENT)
rte_pktmbuf_free(pkt);
}
virtual_ethdev_stats_reset(struct rte_eth_dev *dev)
{
struct virtual_ethdev_private *dev_private = dev->data->dev_private;
- struct rte_mbuf *pkt = NULL;
+ void *pkt = NULL;
- while (rte_ring_dequeue(dev_private->tx_queue, (void **)&pkt) == -ENOBUFS)
+ while (rte_ring_dequeue(dev_private->tx_queue, &pkt) == -ENOBUFS)
rte_pktmbuf_free(pkt);
/* Reset internal statistics */
{}
-static struct eth_dev_ops virtual_ethdev_default_dev_ops = {
- .dev_configure = virtual_ethdev_configure_success,
- .dev_start = virtual_ethdev_start_success,
- .dev_stop = virtual_ethdev_stop,
- .dev_close = virtual_ethdev_close,
- .dev_infos_get = virtual_ethdev_info_get,
- .rx_queue_setup = virtual_ethdev_rx_queue_setup_success,
- .tx_queue_setup = virtual_ethdev_tx_queue_setup_success,
- .rx_queue_release = virtual_ethdev_rx_queue_release,
- .tx_queue_release = virtual_ethdev_tx_queue_release,
- .link_update = virtual_ethdev_link_update_success,
- .stats_get = virtual_ethdev_stats_get,
- .stats_reset = virtual_ethdev_stats_reset,
- .promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
- .promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
+static const struct eth_dev_ops virtual_ethdev_default_dev_ops = {
+ .dev_configure = virtual_ethdev_configure_success,
+ .dev_start = virtual_ethdev_start_success,
+ .dev_stop = virtual_ethdev_stop,
+ .dev_close = virtual_ethdev_close,
+ .dev_infos_get = virtual_ethdev_info_get,
+ .rx_queue_setup = virtual_ethdev_rx_queue_setup_success,
+ .tx_queue_setup = virtual_ethdev_tx_queue_setup_success,
+ .rx_queue_release = virtual_ethdev_rx_queue_release,
+ .tx_queue_release = virtual_ethdev_tx_queue_release,
+ .link_update = virtual_ethdev_link_update_success,
+ .stats_get = virtual_ethdev_stats_get,
+ .stats_reset = virtual_ethdev_stats_reset,
+ .promiscuous_enable = virtual_ethdev_promiscuous_mode_enable,
+ .promiscuous_disable = virtual_ethdev_promiscuous_mode_disable
};
void
virtual_ethdev_start_fn_set_success(uint8_t port_id, uint8_t success)
{
- struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+ struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+ struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
if (success)
- vrtl_eth_dev->dev_ops->dev_start = virtual_ethdev_start_success;
+ dev_ops->dev_start = virtual_ethdev_start_success;
else
- vrtl_eth_dev->dev_ops->dev_start = virtual_ethdev_start_fail;
+ dev_ops->dev_start = virtual_ethdev_start_fail;
}
void
virtual_ethdev_configure_fn_set_success(uint8_t port_id, uint8_t success)
{
- struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+ struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+ struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
if (success)
- vrtl_eth_dev->dev_ops->dev_configure = virtual_ethdev_configure_success;
+ dev_ops->dev_configure = virtual_ethdev_configure_success;
else
- vrtl_eth_dev->dev_ops->dev_configure = virtual_ethdev_configure_fail;
+ dev_ops->dev_configure = virtual_ethdev_configure_fail;
}
void
virtual_ethdev_rx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
{
- struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+ struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+ struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
if (success)
- vrtl_eth_dev->dev_ops->rx_queue_setup =
- virtual_ethdev_rx_queue_setup_success;
+ dev_ops->rx_queue_setup = virtual_ethdev_rx_queue_setup_success;
else
- vrtl_eth_dev->dev_ops->rx_queue_setup =
- virtual_ethdev_rx_queue_setup_fail;
+ dev_ops->rx_queue_setup = virtual_ethdev_rx_queue_setup_fail;
}
void
virtual_ethdev_tx_queue_setup_fn_set_success(uint8_t port_id, uint8_t success)
{
- struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+ struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+ struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
if (success)
- vrtl_eth_dev->dev_ops->tx_queue_setup =
- virtual_ethdev_tx_queue_setup_success;
+ dev_ops->tx_queue_setup = virtual_ethdev_tx_queue_setup_success;
else
- vrtl_eth_dev->dev_ops->tx_queue_setup =
- virtual_ethdev_tx_queue_setup_fail;
+ dev_ops->tx_queue_setup = virtual_ethdev_tx_queue_setup_fail;
}
void
virtual_ethdev_link_update_fn_set_success(uint8_t port_id, uint8_t success)
{
- struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id];
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+ struct virtual_ethdev_private *dev_private = dev->data->dev_private;
+ struct eth_dev_ops *dev_ops = &dev_private->dev_ops;
if (success)
- vrtl_eth_dev->dev_ops->link_update = virtual_ethdev_link_update_success;
+ dev_ops->link_update = virtual_ethdev_link_update_success;
else
- vrtl_eth_dev->dev_ops->link_update = virtual_ethdev_link_update_fail;
+ dev_ops->link_update = virtual_ethdev_link_update_fail;
}
struct rte_eth_dev *eth_dev = NULL;
struct eth_driver *eth_drv = NULL;
struct rte_pci_driver *pci_drv = NULL;
- struct eth_dev_ops *dev_ops = NULL;
struct rte_pci_id *id_table = NULL;
struct virtual_ethdev_private *dev_private = NULL;
char name_buf[RTE_RING_NAMESIZE];
if (pci_drv == NULL)
goto err;
- dev_ops = rte_zmalloc_socket(name, sizeof(*dev_ops), 0, socket_id);
- if (dev_ops == NULL)
- goto err;
-
id_table = rte_zmalloc_socket(name, sizeof(*id_table), 0, socket_id);
if (id_table == NULL)
goto err;
if (dev_private == NULL)
goto err;
- memset(dev_private, 0, sizeof(*dev_private));
-
snprintf(name_buf, sizeof(name_buf), "%s_rxQ", name);
dev_private->rx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, socket_id,
0);
eth_dev->data->dev_private = dev_private;
- eth_dev->dev_ops = dev_ops;
-
/* Copy default device operation functions */
- memcpy(eth_dev->dev_ops, &virtual_ethdev_default_dev_ops,
- sizeof(*eth_dev->dev_ops));
+ dev_private->dev_ops = virtual_ethdev_default_dev_ops;
+ eth_dev->dev_ops = &dev_private->dev_ops;
eth_dev->pci_dev = pci_dev;
eth_dev->pci_dev->driver = ð_drv->pci_drv;
return eth_dev->data->port_id;
err:
- if (pci_dev)
- rte_free(pci_dev);
- if (pci_drv)
- rte_free(pci_drv);
- if (eth_drv)
- rte_free(eth_drv);
- if (dev_ops)
- rte_free(dev_ops);
- if (id_table)
- rte_free(id_table);
- if (dev_private)
- rte_free(dev_private);
+ rte_free(pci_dev);
+ rte_free(pci_drv);
+ rte_free(eth_drv);
+ rte_free(id_table);
+ rte_free(dev_private);
return -1;
}