X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fvirtual_pmd.c;h=6e4dcd8f9656de4d823dd028b52755f1e12f49b7;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=0c67a10b111ab8c5c17cc668bda7391095c9df68;hpb=92073ef961ee1e3a0e34bf17fa17ad1dbece74bb;p=dpdk.git diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c index 0c67a10b11..6e4dcd8f96 100644 --- a/app/test/virtual_pmd.c +++ b/app/test/virtual_pmd.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "virtual_pmd.h" @@ -44,10 +45,13 @@ 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_mbuf *rx_pkt_burst[MAX_PKT_BURST]; - int rx_pkt_burst_len; + struct rte_ring *rx_queue; + struct rte_ring *tx_queue; + + int tx_burst_fail_count; }; struct virtual_ethdev_queue { @@ -72,8 +76,16 @@ virtual_ethdev_start_fail(struct rte_eth_dev *eth_dev __rte_unused) } static void virtual_ethdev_stop(struct rte_eth_dev *eth_dev __rte_unused) { - eth_dev->data->dev_link.link_status = 0; + void *pkt = NULL; + struct virtual_ethdev_private *prv = eth_dev->data->dev_private; + + eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; eth_dev->data->dev_started = 0; + while (rte_ring_dequeue(prv->rx_queue, &pkt) != -ENOENT) + rte_pktmbuf_free(pkt); + + while (rte_ring_dequeue(prv->tx_queue, &pkt) != -ENOENT) + rte_pktmbuf_free(pkt); } static void @@ -105,7 +117,6 @@ virtual_ethdev_info_get(struct rte_eth_dev *dev __rte_unused, dev_info->max_tx_queues = (uint16_t)512; dev_info->min_rx_bufsize = 0; - dev_info->pci_dev = NULL; } static int @@ -187,7 +198,7 @@ virtual_ethdev_link_update_success(struct rte_eth_dev *bonded_eth_dev, int wait_to_complete __rte_unused) { if (!bonded_eth_dev->data->dev_started) - bonded_eth_dev->data->dev_link.link_status = 0; + bonded_eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; return 0; } @@ -212,8 +223,10 @@ static void virtual_ethdev_stats_reset(struct rte_eth_dev *dev) { struct virtual_ethdev_private *dev_private = dev->data->dev_private; + void *pkt = NULL; - dev_private->rx_pkt_burst_len = 0; + while (rte_ring_dequeue(dev_private->tx_queue, &pkt) == -ENOBUFS) + rte_pktmbuf_free(pkt); /* Reset internal statistics */ memset(&dev_private->eth_stats, 0, sizeof(dev_private->eth_stats)); @@ -228,82 +241,88 @@ virtual_ethdev_promiscuous_mode_disable(struct rte_eth_dev *dev __rte_unused) {} -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; } @@ -316,29 +335,23 @@ virtual_ethdev_rx_burst_success(void *queue __rte_unused, struct virtual_ethdev_queue *pq_map; struct virtual_ethdev_private *dev_private; - int i; + int rx_count, i; pq_map = (struct virtual_ethdev_queue *)queue; - vrtl_eth_dev = &rte_eth_devices[pq_map->port_id]; - dev_private = vrtl_eth_dev->data->dev_private; - if (dev_private->rx_pkt_burst_len > 0) { - if (dev_private->rx_pkt_burst_len < nb_pkts) { + rx_count = rte_ring_dequeue_burst(dev_private->rx_queue, (void **) bufs, + nb_pkts); - for (i = 0; i < dev_private->rx_pkt_burst_len; i++) { - bufs[i] = dev_private->rx_pkt_burst[i]; - dev_private->rx_pkt_burst[i] = NULL; - } + /* increments ipackets count */ + dev_private->eth_stats.ipackets += rx_count; - dev_private->eth_stats.ipackets = dev_private->rx_pkt_burst_len; - } - /* reset private burst values */ - dev_private->rx_pkt_burst_len = 0; - } + /* increments ibytes count */ + for (i = 0; i < rx_count; i++) + dev_private->eth_stats.ibytes += rte_pktmbuf_pkt_len(bufs[i]); - return dev_private->eth_stats.ipackets; + return rx_count; } static uint16_t @@ -350,42 +363,67 @@ virtual_ethdev_rx_burst_fail(void *queue __rte_unused, } static uint16_t -virtual_ethdev_tx_burst_success(void *queue, - struct rte_mbuf **bufs __rte_unused, - uint16_t nb_pkts) +virtual_ethdev_tx_burst_success(void *queue, struct rte_mbuf **bufs, + uint16_t nb_pkts) { + struct virtual_ethdev_queue *tx_q = (struct virtual_ethdev_queue *)queue; + struct rte_eth_dev *vrtl_eth_dev; - struct virtual_ethdev_queue *tx_q; struct virtual_ethdev_private *dev_private; - int i; - tx_q = (struct virtual_ethdev_queue *)queue; + int i; vrtl_eth_dev = &rte_eth_devices[tx_q->port_id]; + dev_private = vrtl_eth_dev->data->dev_private; - if (vrtl_eth_dev->data->dev_link.link_status) { - dev_private = vrtl_eth_dev->data->dev_private; - dev_private->eth_stats.opackets += nb_pkts; - - return nb_pkts; - } + if (!vrtl_eth_dev->data->dev_link.link_status) + nb_pkts = 0; + else + nb_pkts = rte_ring_enqueue_burst(dev_private->tx_queue, (void **)bufs, + nb_pkts); - /* free packets in burst */ - for (i = 0; i < nb_pkts; i++) { - if (bufs[i] != NULL) - rte_pktmbuf_free(bufs[i]); + /* increment opacket count */ + dev_private->eth_stats.opackets += nb_pkts; - bufs[i] = NULL; - } + /* increment obytes count */ + for (i = 0; i < nb_pkts; i++) + dev_private->eth_stats.obytes += rte_pktmbuf_pkt_len(bufs[i]); - return 0; + return nb_pkts; } - static uint16_t -virtual_ethdev_tx_burst_fail(void *queue __rte_unused, - struct rte_mbuf **bufs __rte_unused, uint16_t nb_pkts __rte_unused) +virtual_ethdev_tx_burst_fail(void *queue, struct rte_mbuf **bufs, + uint16_t nb_pkts) { + struct rte_eth_dev *vrtl_eth_dev = NULL; + struct virtual_ethdev_queue *tx_q = NULL; + struct virtual_ethdev_private *dev_private = NULL; + + int i; + + tx_q = (struct virtual_ethdev_queue *)queue; + vrtl_eth_dev = &rte_eth_devices[tx_q->port_id]; + dev_private = vrtl_eth_dev->data->dev_private; + + if (dev_private->tx_burst_fail_count < nb_pkts) { + int successfully_txd = nb_pkts - dev_private->tx_burst_fail_count; + + /* increment opacket count */ + dev_private->eth_stats.opackets += successfully_txd; + + /* free packets in burst */ + for (i = 0; i < successfully_txd; i++) { + /* free packets in burst */ + if (bufs[i] != NULL) + rte_pktmbuf_free(bufs[i]); + + bufs[i] = NULL; + } + + return successfully_txd; + } + return 0; } @@ -405,42 +443,72 @@ virtual_ethdev_rx_burst_fn_set_success(uint8_t port_id, uint8_t success) void virtual_ethdev_tx_burst_fn_set_success(uint8_t port_id, uint8_t success) { + struct virtual_ethdev_private *dev_private = NULL; struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; + dev_private = vrtl_eth_dev->data->dev_private; + if (success) vrtl_eth_dev->tx_pkt_burst = virtual_ethdev_tx_burst_success; else vrtl_eth_dev->tx_pkt_burst = virtual_ethdev_tx_burst_fail; -} + dev_private->tx_burst_fail_count = 0; +} void -virtual_ethdev_simulate_link_status_interrupt(uint8_t port_id, uint8_t link_status) +virtual_ethdev_tx_burst_fn_set_tx_pkt_fail_count(uint8_t port_id, + uint8_t packet_fail_count) { + struct virtual_ethdev_private *dev_private = NULL; struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; - vrtl_eth_dev->data->dev_link.link_status = link_status; - _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC); + dev_private = vrtl_eth_dev->data->dev_private; + dev_private->tx_burst_fail_count = packet_fail_count; } +void +virtual_ethdev_set_link_status(uint8_t port_id, uint8_t link_status) +{ + struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; + vrtl_eth_dev->data->dev_link.link_status = link_status; +} void +virtual_ethdev_simulate_link_status_interrupt(uint8_t port_id, + uint8_t link_status) +{ + struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; + + vrtl_eth_dev->data->dev_link.link_status = link_status; + + _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL); +} + +int virtual_ethdev_add_mbufs_to_rx_queue(uint8_t port_id, struct rte_mbuf **pkt_burst, int burst_length) { - struct virtual_ethdev_private *dev_private = NULL; struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; + struct virtual_ethdev_private *dev_private = + vrtl_eth_dev->data->dev_private; - int i; - - dev_private = vrtl_eth_dev->data->dev_private; + return rte_ring_enqueue_burst(dev_private->rx_queue, (void **)pkt_burst, + burst_length); +} - for (i = 0; i < burst_length; i++) - dev_private->rx_pkt_burst[i] = pkt_burst[i]; +int +virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id, + struct rte_mbuf **pkt_burst, int burst_length) +{ + struct virtual_ethdev_private *dev_private; + struct rte_eth_dev *vrtl_eth_dev = &rte_eth_devices[port_id]; - dev_private->rx_pkt_burst_len = burst_length; + dev_private = vrtl_eth_dev->data->dev_private; + return rte_ring_dequeue_burst(dev_private->tx_queue, (void **)pkt_burst, + burst_length); } static uint8_t @@ -458,18 +526,17 @@ get_number_of_sockets(void) return ++sockets; } - int virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, - uint8_t socket_id) + uint8_t socket_id, uint8_t isr_support) { struct rte_pci_device *pci_dev = NULL; 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]; /* now do all data allocation - for eth_dev structure, dummy pci driver @@ -491,37 +558,50 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, 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; + id_table->device_id = 0xBEEF; dev_private = rte_zmalloc_socket(name, sizeof(*dev_private), 0, socket_id); if (dev_private == NULL) goto err; + snprintf(name_buf, sizeof(name_buf), "%s_rxQ", name); + dev_private->rx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, socket_id, + 0); + if (dev_private->rx_queue == NULL) + goto err; + + snprintf(name_buf, sizeof(name_buf), "%s_txQ", name); + dev_private->tx_queue = rte_ring_create(name_buf, MAX_PKT_BURST, socket_id, + 0); + if (dev_private->tx_queue == NULL) + goto err; + /* reserve an ethdev entry */ eth_dev = rte_eth_dev_allocate(name); if (eth_dev == NULL) goto err; - pci_dev->numa_node = socket_id; - pci_drv->name = virtual_ethdev_driver_name; + pci_dev->device.numa_node = socket_id; + pci_drv->driver.name = virtual_ethdev_driver_name; pci_drv->id_table = id_table; + if (isr_support) + pci_drv->drv_flags |= RTE_PCI_DRV_INTR_LSC; + else + pci_drv->drv_flags &= ~RTE_PCI_DRV_INTR_LSC; + + eth_drv->pci_drv = (struct rte_pci_driver)(*pci_drv); eth_dev->driver = eth_drv; eth_dev->data->nb_rx_queues = (uint16_t)1; eth_dev->data->nb_tx_queues = (uint16_t)1; - TAILQ_INIT(&(eth_dev->callbacks)); - - eth_dev->data->dev_link.link_status = 0; - eth_dev->data->dev_link.link_speed = ETH_LINK_SPEED_10000; + eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; + eth_dev->data->dev_link.link_speed = ETH_SPEED_NUM_10G; eth_dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX; eth_dev->data->mac_addrs = rte_zmalloc(name, ETHER_ADDR_LEN, 0); @@ -530,26 +610,20 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, memcpy(eth_dev->data->mac_addrs, mac_addr, sizeof(*eth_dev->data->mac_addrs)); - eth_dev->data->mac_addrs->addr_bytes[5] = eth_dev->data->port_id; eth_dev->data->dev_started = 0; eth_dev->data->promiscuous = 0; eth_dev->data->scattered_rx = 0; eth_dev->data->all_multicast = 0; - memset(dev_private, 0, sizeof(*dev_private)); 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)); - - eth_dev->pci_dev = pci_dev; - eth_dev->pci_dev->driver = ð_drv->pci_drv; + dev_private->dev_ops = virtual_ethdev_default_dev_ops; + eth_dev->dev_ops = &dev_private->dev_ops; - eth_dev->pci_dev->driver->id_table->device_id = 0xBEEF; + pci_dev->device.driver = ð_drv->pci_drv.driver; + eth_dev->device = &pci_dev->device; eth_dev->rx_pkt_burst = virtual_ethdev_rx_burst_success; eth_dev->tx_pkt_burst = virtual_ethdev_tx_burst_success; @@ -557,18 +631,11 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, 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; }