doc: announce crypto structures rework

[dpdk.git] / drivers / net / tap / rte_eth_tap.c

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 8321863..e44de02 100644 (file)
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -36,6 +36,7 @@
 #include <rte_common.h>
 #include <rte_mbuf.h>
 #include <rte_ethdev.h>
+#include <rte_ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_vdev.h>
 #include <rte_kvargs.h>
@@ -72,12 +73,6 @@
 #define ETH_TAP_SPEED_ARG       "speed"
 #define ETH_TAP_REMOTE_ARG      "remote"
 
-#ifdef IFF_MULTI_QUEUE
-#define RTE_PMD_TAP_MAX_QUEUES 16
-#else
-#define RTE_PMD_TAP_MAX_QUEUES 1
-#endif
-
 #define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0)
 #define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0)
 
@@ -880,7 +875,9 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
        struct pmd_internals *internals = dev->data->dev_private;
        struct rx_queue *rxq = &internals->rxq[rx_queue_id];
        struct rte_mbuf **tmp = &rxq->pool;
-       struct iovec (*iovecs)[nb_rx_desc + 1];
+       long iov_max = sysconf(_SC_IOV_MAX);
+       uint16_t nb_desc = RTE_MIN(nb_rx_desc, iov_max - 1);
+       struct iovec (*iovecs)[nb_desc + 1];
        int data_off = RTE_PKTMBUF_HEADROOM;
        int ret = 0;
        int fd;
@@ -896,13 +893,13 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->mp = mp;
        rxq->trigger_seen = 1; /* force initial burst */
        rxq->in_port = dev->data->port_id;
-       rxq->nb_rx_desc = nb_rx_desc;
+       rxq->nb_rx_desc = nb_desc;
        iovecs = rte_zmalloc_socket(dev->data->name, sizeof(*iovecs), 0,
                                    socket_id);
        if (!iovecs) {
                RTE_LOG(WARNING, PMD,
                        "%s: Couldn't allocate %d RX descriptors\n",
-                       dev->data->name, nb_rx_desc);
+                       dev->data->name, nb_desc);
                return -ENOMEM;
        }
        rxq->iovecs = iovecs;
@@ -916,7 +913,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
        (*rxq->iovecs)[0].iov_len = sizeof(struct tun_pi);
        (*rxq->iovecs)[0].iov_base = &rxq->pi;
 
-       for (i = 1; i <= nb_rx_desc; i++) {
+       for (i = 1; i <= nb_desc; i++) {
                *tmp = rte_pktmbuf_alloc(rxq->mp);
                if (!*tmp) {
                        RTE_LOG(WARNING, PMD,
@@ -1009,8 +1006,7 @@ tap_nl_msg_handler(struct nlmsghdr *nh, void *arg)
 }
 
 static void
-tap_dev_intr_handler(struct rte_intr_handle *intr_handle __rte_unused,
-                    void *cb_arg)
+tap_dev_intr_handler(void *cb_arg)
 {
        struct rte_eth_dev *dev = cb_arg;
        struct pmd_internals *pmd = dev->data->dev_private;
@@ -1138,12 +1134,13 @@ tap_kernel_support(struct pmd_internals *pmd)
 }
 
 static int
-eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
+eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,
+                  char *remote_iface)
 {
        int numa_node = rte_socket_id();
-       struct rte_eth_dev *dev = NULL;
-       struct pmd_internals *pmd = NULL;
-       struct rte_eth_dev_data *data = NULL;
+       struct rte_eth_dev *dev;
+       struct pmd_internals *pmd;
+       struct rte_eth_dev_data *data;
        int i;
 
        RTE_LOG(DEBUG, PMD, "  TAP device on numa %u\n", rte_socket_id());
@@ -1154,22 +1151,14 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
                goto error_exit;
        }
 
-       pmd = rte_zmalloc_socket(tap_name, sizeof(*pmd), 0, numa_node);
-       if (!pmd) {
-               RTE_LOG(ERR, PMD, "TAP Unable to allocate internal struct\n");
-               goto error_exit;
-       }
-
-       /* name in allocation and data->name must be consistent */
-       snprintf(data->name, sizeof(data->name), "%s", name);
-       dev = rte_eth_dev_allocate(name);
+       dev = rte_eth_vdev_allocate(vdev, sizeof(*pmd));
        if (!dev) {
                RTE_LOG(ERR, PMD, "TAP Unable to allocate device struct\n");
                goto error_exit;
        }
 
+       pmd = dev->data->dev_private;
        snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name);
-
        pmd->nb_queues = RTE_PMD_TAP_MAX_QUEUES;
 
        pmd->ioctl_sock = socket(AF_INET, SOCK_DGRAM, 0);
@@ -1181,13 +1170,11 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
        }
 
        /* Setup some default values */
+       rte_memcpy(data, dev->data, sizeof(*data));
        data->dev_private = pmd;
-       data->port_id = dev->data->port_id;
-       data->mtu = dev->data->mtu;
        data->dev_flags = RTE_ETH_DEV_DETACHABLE | RTE_ETH_DEV_INTR_LSC;
-       data->kdrv = RTE_KDRV_NONE;
-       data->drv_name = pmd_tap_drv.driver.name;
        data->numa_node = numa_node;
+       data->drv_name = pmd_tap_drv.driver.name;
 
        data->dev_link = pmd_link;
        data->mac_addrs = &pmd->eth_addr;
@@ -1196,7 +1183,6 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
 
        dev->data = data;
        dev->dev_ops = &ops;
-       dev->driver = NULL;
        dev->rx_pkt_burst = pmd_rx_burst;
        dev->tx_pkt_burst = pmd_tx_burst;
 
@@ -1243,13 +1229,10 @@ eth_dev_tap_create(const char *name, char *tap_name, char *remote_iface)
        return 0;
 
 error_exit:
-       RTE_LOG(DEBUG, PMD, "TAP Unable to initialize %s\n", name);
+       RTE_LOG(DEBUG, PMD, "TAP Unable to initialize %s\n",
+               rte_vdev_device_name(vdev));
 
        rte_free(data);
-       rte_free(pmd);
-
-       rte_eth_dev_release_port(dev);
-
        return -EINVAL;
 }
 
@@ -1295,14 +1278,18 @@ set_remote_iface(const char *key __rte_unused,
 /* Open a TAP interface device.
  */
 static int
-rte_pmd_tap_probe(const char *name, const char *params)
+rte_pmd_tap_probe(struct rte_vdev_device *dev)
 {
+       const char *name, *params;
        int ret;
        struct rte_kvargs *kvlist = NULL;
        int speed;
        char tap_name[RTE_ETH_NAME_MAX_LEN];
        char remote_iface[RTE_ETH_NAME_MAX_LEN];
 
+       name = rte_vdev_device_name(dev);
+       params = rte_vdev_device_args(dev);
+
        speed = ETH_SPEED_NUM_10G;
        snprintf(tap_name, sizeof(tap_name), "%s%d",
                 DEFAULT_TAP_NAME, tap_unit++);
@@ -1346,7 +1333,7 @@ rte_pmd_tap_probe(const char *name, const char *params)
        RTE_LOG(NOTICE, PMD, "Initializing pmd_tap for %s as %s\n",
                name, tap_name);
 
-       ret = eth_dev_tap_create(name, tap_name, remote_iface);
+       ret = eth_dev_tap_create(dev, tap_name, remote_iface);
 
 leave:
        if (ret == -1) {
@@ -1362,7 +1349,7 @@ leave:
 /* detach a TAP device.
  */
 static int
-rte_pmd_tap_remove(const char *name)
+rte_pmd_tap_remove(struct rte_vdev_device *dev)
 {
        struct rte_eth_dev *eth_dev = NULL;
        struct pmd_internals *internals;
@@ -1372,7 +1359,7 @@ rte_pmd_tap_remove(const char *name)
                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)
                return 0;
 
@@ -1401,4 +1388,7 @@ static struct rte_vdev_driver pmd_tap_drv = {
 };
 RTE_PMD_REGISTER_VDEV(net_tap, pmd_tap_drv);
 RTE_PMD_REGISTER_ALIAS(net_tap, eth_tap);
-RTE_PMD_REGISTER_PARAM_STRING(net_tap, "iface=<string>,speed=N");
+RTE_PMD_REGISTER_PARAM_STRING(net_tap,
+                             ETH_TAP_IFACE_ARG "=<string> "
+                             ETH_TAP_SPEED_ARG "=<int> "
+                             ETH_TAP_REMOTE_ARG "=<string>");