Imported Upstream version 17.05

[deb_dpdk.git] / drivers / net / pcap / rte_eth_pcap.c

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 57b0b31..defb3b4 100644 (file)
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -40,6 +40,7 @@
 
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
+#include <rte_ethdev_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
@@ -119,7 +120,6 @@ static struct ether_addr eth_addr = {
        .addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 }
 };
 
-static const char *drivername = "Pcap PMD";
 static struct rte_eth_link pmd_link = {
                .link_speed = ETH_SPEED_NUM_10G,
                .link_duplex = ETH_LINK_FULL_DUPLEX,
@@ -294,9 +294,9 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                        }
                }
 
-               rte_pktmbuf_free(mbuf);
                num_tx++;
                tx_bytes += mbuf->pkt_len;
+               rte_pktmbuf_free(mbuf);
        }
 
        /*
@@ -552,14 +552,12 @@ eth_dev_info(struct rte_eth_dev *dev,
 {
        struct pmd_internals *internals = dev->data->dev_private;
 
-       dev_info->driver_name = drivername;
        dev_info->if_index = internals->if_index;
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t) -1;
        dev_info->max_rx_queues = dev->data->nb_rx_queues;
        dev_info->max_tx_queues = dev->data->nb_tx_queues;
        dev_info->min_rx_bufsize = 0;
-       dev_info->pci_dev = NULL;
 }
 
 static void
@@ -790,15 +788,20 @@ open_tx_iface(const char *key, const char *value, void *extra_args)
        return 0;
 }
 
+static struct rte_vdev_driver pmd_pcap_drv;
+
 static int
-pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
+pmd_init_internals(struct rte_vdev_device *vdev,
+               const unsigned int nb_rx_queues,
                const unsigned int nb_tx_queues,
                struct pmd_internals **internals,
                struct rte_eth_dev **eth_dev)
 {
        struct rte_eth_dev_data *data = NULL;
-       unsigned int numa_node = rte_socket_id();
+       unsigned int numa_node = vdev->device.numa_node;
+       const char *name;
 
+       name = rte_vdev_device_name(vdev);
        RTE_LOG(INFO, PMD, "Creating pcap-backed ethdev on numa socket %u\n",
                numa_node);
 
@@ -807,17 +810,14 @@ pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
         */
        data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
        if (data == NULL)
-               goto error;
-
-       *internals = rte_zmalloc_socket(name, sizeof(**internals), 0,
-                       numa_node);
-       if (*internals == NULL)
-               goto error;
+               return -1;
 
        /* reserve an ethdev entry */
-       *eth_dev = rte_eth_dev_allocate(name);
-       if (*eth_dev == NULL)
-               goto error;
+       *eth_dev = rte_eth_vdev_allocate(vdev, sizeof(**internals));
+       if (*eth_dev == NULL) {
+               rte_free(data);
+               return -1;
+       }
 
        /* now put it all together
         * - store queue data in internals,
@@ -825,9 +825,8 @@ pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
         * - point eth_dev_data to internals
         * - and point eth_dev structure to new eth_dev_data structure
         */
-       data->dev_private = *internals;
-       data->port_id = (*eth_dev)->data->port_id;
-       snprintf(data->name, sizeof(data->name), "%s", (*eth_dev)->data->name);
+       *internals = (*eth_dev)->data->dev_private;
+       rte_memcpy(data, (*eth_dev)->data, sizeof(*data));
        data->nb_rx_queues = (uint16_t)nb_rx_queues;
        data->nb_tx_queues = (uint16_t)nb_tx_queues;
        data->dev_link = pmd_link;
@@ -839,26 +838,17 @@ pmd_init_internals(const char *name, const unsigned int nb_rx_queues,
         */
        (*eth_dev)->data = data;
        (*eth_dev)->dev_ops = &ops;
-       (*eth_dev)->driver = NULL;
        data->dev_flags = RTE_ETH_DEV_DETACHABLE;
-       data->kdrv = RTE_KDRV_NONE;
-       data->drv_name = drivername;
-       data->numa_node = numa_node;
 
        return 0;
-
-error:
-       rte_free(data);
-       rte_free(*internals);
-
-       return -1;
 }
 
 static int
-eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
-               const unsigned int nb_rx_queues, struct pmd_devargs *tx_queues,
-               const unsigned int nb_tx_queues, struct rte_kvargs *kvlist,
-               struct pmd_internals **internals, struct rte_eth_dev **eth_dev)
+eth_from_pcaps_common(struct rte_vdev_device *vdev,
+               struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
+               struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
+               struct rte_kvargs *kvlist, struct pmd_internals **internals,
+               struct rte_eth_dev **eth_dev)
 {
        struct rte_kvargs_pair *pair = NULL;
        unsigned int k_idx;
@@ -870,7 +860,7 @@ eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
        if (tx_queues == NULL && nb_tx_queues > 0)
                return -1;
 
-       if (pmd_init_internals(name, nb_rx_queues, nb_tx_queues, internals,
+       if (pmd_init_internals(vdev, nb_rx_queues, nb_tx_queues, internals,
                        eth_dev) < 0)
                return -1;
 
@@ -908,16 +898,17 @@ eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
 }
 
 static int
-eth_from_pcaps(const char *name, struct pmd_devargs *rx_queues,
-               const unsigned int nb_rx_queues, struct pmd_devargs *tx_queues,
-               const unsigned int nb_tx_queues, struct rte_kvargs *kvlist,
-               int single_iface, unsigned int using_dumpers)
+eth_from_pcaps(struct rte_vdev_device *vdev,
+               struct pmd_devargs *rx_queues, const unsigned int nb_rx_queues,
+               struct pmd_devargs *tx_queues, const unsigned int nb_tx_queues,
+               struct rte_kvargs *kvlist, int single_iface,
+               unsigned int using_dumpers)
 {
        struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
        int ret;
 
-       ret = eth_from_pcaps_common(name, rx_queues, nb_rx_queues,
+       ret = eth_from_pcaps_common(vdev, rx_queues, nb_rx_queues,
                tx_queues, nb_tx_queues, kvlist, &internals, &eth_dev);
 
        if (ret < 0)
@@ -937,8 +928,9 @@ eth_from_pcaps(const char *name, struct pmd_devargs *rx_queues,
 }
 
 static int
-pmd_pcap_probe(const char *name, const char *params)
+pmd_pcap_probe(struct rte_vdev_device *dev)
 {
+       const char *name;
        unsigned int is_rx_pcap = 0, is_tx_pcap = 0;
        struct rte_kvargs *kvlist;
        struct pmd_devargs pcaps = {0};
@@ -946,13 +938,14 @@ pmd_pcap_probe(const char *name, const char *params)
        int single_iface = 0;
        int ret;
 
+       name = rte_vdev_device_name(dev);
        RTE_LOG(INFO, PMD, "Initializing pmd_pcap for %s\n", name);
 
        gettimeofday(&start_time, NULL);
        start_cycles = rte_get_timer_cycles();
        hz = rte_get_timer_hz();
 
-       kvlist = rte_kvargs_parse(params, valid_arguments);
+       kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments);
        if (kvlist == NULL)
                return -1;
 
@@ -1026,7 +1019,7 @@ pmd_pcap_probe(const char *name, const char *params)
                goto free_kvlist;
 
 create_eth:
-       ret = eth_from_pcaps(name, &pcaps, pcaps.num_of_queue, &dumpers,
+       ret = eth_from_pcaps(dev, &pcaps, pcaps.num_of_queue, &dumpers,
                dumpers.num_of_queue, kvlist, single_iface, is_tx_pcap);
 
 free_kvlist:
@@ -1036,18 +1029,18 @@ free_kvlist:
 }
 
 static int
-pmd_pcap_remove(const char *name)
+pmd_pcap_remove(struct rte_vdev_device *dev)
 {
        struct rte_eth_dev *eth_dev = NULL;
 
        RTE_LOG(INFO, PMD, "Closing pcap ethdev on numa socket %u\n",
                        rte_socket_id());
 
-       if (name == NULL)
+       if (!dev)
                return -1;
 
        /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocated(name);
+       eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
        if (eth_dev == NULL)
                return -1;