Imported Upstream version 17.05

[deb_dpdk.git] / drivers / net / null / rte_eth_null.c

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 836d982..abf3ec7 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -33,14 +33,13 @@
 
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
+#include <rte_ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_vdev.h>
 #include <rte_kvargs.h>
 #include <rte_spinlock.h>
 
-#include "rte_eth_null.h"
-
 #define ETH_NULL_PACKET_SIZE_ARG       "size"
 #define ETH_NULL_PACKET_COPY_ARG       "copy"
 
@@ -50,6 +49,7 @@ static unsigned default_packet_copy;
 static const char *valid_arguments[] = {
        ETH_NULL_PACKET_SIZE_ARG,
        ETH_NULL_PACKET_COPY_ARG,
+       "driver",
        NULL
 };
 
@@ -88,7 +88,6 @@ struct pmd_internals {
 
 
 static struct ether_addr eth_addr = { .addr_bytes = {0} };
-static const char *drivername = "Null PMD";
 static struct rte_eth_link pmd_link = {
        .link_speed = ETH_SPEED_NUM_10G,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
@@ -113,8 +112,6 @@ eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
                        break;
                bufs[i]->data_len = (uint16_t)packet_size;
                bufs[i]->pkt_len = packet_size;
-               bufs[i]->nb_segs = 1;
-               bufs[i]->next = NULL;
                bufs[i]->port = h->internals->port_id;
        }
 
@@ -295,13 +292,11 @@ eth_dev_info(struct rte_eth_dev *dev,
                return;
 
        internals = dev->data->dev_private;
-       dev_info->driver_name = drivername;
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t)-1;
        dev_info->max_rx_queues = RTE_DIM(internals->rx_null_queues);
        dev_info->max_tx_queues = RTE_DIM(internals->tx_null_queues);
        dev_info->min_rx_bufsize = 0;
-       dev_info->pci_dev = NULL;
        dev_info->reta_size = internals->reta_size;
        dev_info->flow_type_rss_offloads = internals->flow_type_rss_offloads;
 }
@@ -480,9 +475,10 @@ static const struct eth_dev_ops ops = {
        .rss_hash_conf_get = eth_rss_hash_conf_get
 };
 
-int
-eth_dev_null_create(const char *name,
-               const unsigned numa_node,
+static struct rte_vdev_driver pmd_null_drv;
+
+static int
+eth_dev_null_create(struct rte_vdev_device *dev,
                unsigned packet_size,
                unsigned packet_copy)
 {
@@ -499,27 +495,25 @@ eth_dev_null_create(const char *name,
                0xBE, 0xAC, 0x01, 0xFA
        };
 
-       if (name == NULL)
-               return -EINVAL;
+       if (dev->device.numa_node == SOCKET_ID_ANY)
+               dev->device.numa_node = rte_socket_id();
 
        RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n",
-                       numa_node);
+               dev->device.numa_node);
 
        /* now do all data allocation - for eth_dev structure, dummy pci driver
         * and internal (private) data
         */
-       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;
+       data = rte_zmalloc_socket(rte_vdev_device_name(dev), sizeof(*data), 0,
+               dev->device.numa_node);
+       if (!data)
+               return -ENOMEM;
 
-       /* reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate(name);
-       if (eth_dev == NULL)
-               goto error;
+       eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
+       if (!eth_dev) {
+               rte_free(data);
+               return -ENOMEM;
+       }
 
        /* now put it all together
         * - store queue data in internals,
@@ -530,6 +524,7 @@ eth_dev_null_create(const char *name,
        /* NOTE: we'll replace the data element, of originally allocated eth_dev
         * so the nulls are local per-process */
 
+       internals = eth_dev->data->dev_private;
        internals->packet_size = packet_size;
        internals->packet_copy = packet_copy;
        internals->port_id = eth_dev->data->port_id;
@@ -539,24 +534,16 @@ eth_dev_null_create(const char *name,
 
        rte_memcpy(internals->rss_key, default_rss_key, 40);
 
-       data->dev_private = internals;
-       data->port_id = eth_dev->data->port_id;
+       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;
        data->mac_addrs = &eth_addr;
-       strncpy(data->name, eth_dev->data->name, strlen(eth_dev->data->name));
 
        eth_dev->data = data;
        eth_dev->dev_ops = &ops;
 
-       TAILQ_INIT(&eth_dev->link_intr_cbs);
-
-       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;
 
        /* finally assign rx and tx ops */
        if (packet_copy) {
@@ -568,12 +555,6 @@ eth_dev_null_create(const char *name,
        }
 
        return 0;
-
-error:
-       rte_free(data);
-       rte_free(internals);
-
-       return -1;
 }
 
 static inline int
@@ -611,21 +592,21 @@ get_packet_copy_arg(const char *key __rte_unused,
 }
 
 static int
-rte_pmd_null_probe(const char *name, const char *params)
+rte_pmd_null_probe(struct rte_vdev_device *dev)
 {
-       unsigned numa_node;
+       const char *name, *params;
        unsigned packet_size = default_packet_size;
        unsigned packet_copy = default_packet_copy;
        struct rte_kvargs *kvlist = NULL;
        int ret;
 
-       if (name == NULL)
+       if (!dev)
                return -EINVAL;
 
+       name = rte_vdev_device_name(dev);
+       params = rte_vdev_device_args(dev);
        RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name);
 
-       numa_node = rte_socket_id();
-
        if (params != NULL) {
                kvlist = rte_kvargs_parse(params, valid_arguments);
                if (kvlist == NULL)
@@ -654,7 +635,7 @@ rte_pmd_null_probe(const char *name, const char *params)
                        "packet copy is %s\n", packet_size,
                        packet_copy ? "enabled" : "disabled");
 
-       ret = eth_dev_null_create(name, numa_node, packet_size, packet_copy);
+       ret = eth_dev_null_create(dev, packet_size, packet_copy);
 
 free_kvlist:
        if (kvlist)
@@ -663,18 +644,18 @@ free_kvlist:
 }
 
 static int
-rte_pmd_null_remove(const char *name)
+rte_pmd_null_remove(struct rte_vdev_device *dev)
 {
        struct rte_eth_dev *eth_dev = NULL;
 
-       if (name == NULL)
+       if (!dev)
                return -EINVAL;
 
        RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n",
                        rte_socket_id());
 
        /* find the 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;