net/af_packet: fix munmap on init failure

[dpdk.git] / drivers / net / ring / rte_eth_ring.c

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index eb347bc..733c898 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -41,7 +41,6 @@ struct ring_queue {
        struct rte_ring *rng;
        rte_atomic64_t rx_pkts;
        rte_atomic64_t tx_pkts;
-       rte_atomic64_t err_pkts;
 };
 
 struct pmd_internals {
@@ -62,7 +61,7 @@ static struct rte_eth_link pmd_link = {
        .link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_ring_logtype;
+RTE_LOG_REGISTER(eth_ring_logtype, pmd.net.ring, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_ring_logtype, \
@@ -89,13 +88,10 @@ eth_ring_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        struct ring_queue *r = q;
        const uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng,
                        ptrs, nb_bufs, NULL);
-       if (r->rng->flags & RING_F_SP_ENQ) {
+       if (r->rng->flags & RING_F_SP_ENQ)
                r->tx_pkts.cnt += nb_tx;
-               r->err_pkts.cnt += nb_bufs - nb_tx;
-       } else {
+       else
                rte_atomic64_add(&(r->tx_pkts), nb_tx);
-               rte_atomic64_add(&(r->err_pkts), nb_bufs - nb_tx);
-       }
        return nb_tx;
 }
 
@@ -155,7 +151,7 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
 }
 
 
-static void
+static int
 eth_dev_info(struct rte_eth_dev *dev,
             struct rte_eth_dev_info *dev_info)
 {
@@ -166,13 +162,15 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->max_rx_queues = (uint16_t)internals->max_rx_queues;
        dev_info->max_tx_queues = (uint16_t)internals->max_tx_queues;
        dev_info->min_rx_bufsize = 0;
+
+       return 0;
 }
 
 static int
 eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
        unsigned int i;
-       unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
+       unsigned long rx_total = 0, tx_total = 0;
        const struct pmd_internals *internal = dev->data->dev_private;
 
        for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
@@ -185,17 +183,15 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                        i < dev->data->nb_tx_queues; i++) {
                stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt;
                tx_total += stats->q_opackets[i];
-               tx_err_total += internal->tx_ring_queues[i].err_pkts.cnt;
        }
 
        stats->ipackets = rx_total;
        stats->opackets = tx_total;
-       stats->oerrors = tx_err_total;
 
        return 0;
 }
 
-static void
+static int
 eth_stats_reset(struct rte_eth_dev *dev)
 {
        unsigned int i;
@@ -203,10 +199,10 @@ eth_stats_reset(struct rte_eth_dev *dev)
 
        for (i = 0; i < dev->data->nb_rx_queues; i++)
                internal->rx_ring_queues[i].rx_pkts.cnt = 0;
-       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+       for (i = 0; i < dev->data->nb_tx_queues; i++)
                internal->tx_ring_queues[i].tx_pkts.cnt = 0;
-               internal->tx_ring_queues[i].err_pkts.cnt = 0;
-       }
+
+       return 0;
 }
 
 static void
@@ -250,6 +246,7 @@ static const struct eth_dev_ops ops = {
 
 static int
 do_eth_dev_ring_create(const char *name,
+               struct rte_vdev_device *vdev,
                struct rte_ring * const rx_queues[],
                const unsigned int nb_rx_queues,
                struct rte_ring *const tx_queues[],
@@ -295,12 +292,15 @@ do_eth_dev_ring_create(const char *name,
        }
 
        /* now put it all together
+        * - store EAL device in eth_dev,
         * - store queue data in internals,
         * - store numa_node info in eth_dev_data
         * - point eth_dev_data to internals
         * - and point eth_dev structure to new eth_dev_data structure
         */
 
+       eth_dev->device = &vdev->device;
+
        data = eth_dev->data;
        data->rx_queues = rx_queues_local;
        data->tx_queues = tx_queues_local;
@@ -322,6 +322,8 @@ do_eth_dev_ring_create(const char *name,
        data->nb_tx_queues = (uint16_t)nb_tx_queues;
        data->dev_link = pmd_link;
        data->mac_addrs = &internals->address;
+       data->promiscuous = 1;
+       data->all_multicast = 1;
 
        eth_dev->dev_ops = &ops;
        data->kdrv = RTE_KDRV_NONE;
@@ -410,7 +412,9 @@ rte_eth_from_ring(struct rte_ring *r)
 }
 
 static int
-eth_dev_ring_create(const char *name, const unsigned int numa_node,
+eth_dev_ring_create(const char *name,
+               struct rte_vdev_device *vdev,
+               const unsigned int numa_node,
                enum dev_action action, struct rte_eth_dev **eth_dev)
 {
        /* rx and tx are so-called from point of view of first port.
@@ -440,7 +444,7 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node,
                        return -1;
        }
 
-       if (do_eth_dev_ring_create(name, rxtx, num_rings, rxtx, num_rings,
+       if (do_eth_dev_ring_create(name, vdev, rxtx, num_rings, rxtx, num_rings,
                numa_node, action, eth_dev) < 0)
                return -1;
 
@@ -562,12 +566,12 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
        PMD_LOG(INFO, "Initializing pmd_ring for %s", name);
 
        if (params == NULL || params[0] == '\0') {
-               ret = eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE,
+               ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE,
                                &eth_dev);
                if (ret == -1) {
                        PMD_LOG(INFO,
                                "Attach to pmd_ring for %s", name);
-                       ret = eth_dev_ring_create(name, rte_socket_id(),
+                       ret = eth_dev_ring_create(name, dev, rte_socket_id(),
                                                  DEV_ATTACH, &eth_dev);
                }
        } else {
@@ -576,19 +580,16 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                if (!kvlist) {
                        PMD_LOG(INFO,
                                "Ignoring unsupported parameters when creatingrings-backed ethernet device");
-                       ret = eth_dev_ring_create(name, rte_socket_id(),
+                       ret = eth_dev_ring_create(name, dev, rte_socket_id(),
                                                  DEV_CREATE, &eth_dev);
                        if (ret == -1) {
                                PMD_LOG(INFO,
                                        "Attach to pmd_ring for %s",
                                        name);
-                               ret = eth_dev_ring_create(name, rte_socket_id(),
+                               ret = eth_dev_ring_create(name, dev, rte_socket_id(),
                                                          DEV_ATTACH, &eth_dev);
                        }
 
-                       if (eth_dev)
-                               eth_dev->device = &dev->device;
-
                        return ret;
                }
 
@@ -599,7 +600,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                        if (ret < 0)
                                goto out_free;
 
-                       ret = do_eth_dev_ring_create(name,
+                       ret = do_eth_dev_ring_create(name, dev,
                                internal_args->rx_queues,
                                internal_args->nb_rx_queues,
                                internal_args->tx_queues,
@@ -629,6 +630,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 
                        for (info->count = 0; info->count < info->total; info->count++) {
                                ret = eth_dev_ring_create(info->list[info->count].name,
+                                                         dev,
                                                          info->list[info->count].node,
                                                          info->list[info->count].action,
                                                          &eth_dev);
@@ -637,7 +639,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                                        PMD_LOG(INFO,
                                                "Attach to pmd_ring for %s",
                                                name);
-                                       ret = eth_dev_ring_create(name,
+                                       ret = eth_dev_ring_create(name, dev,
                                                        info->list[info->count].node,
                                                        DEV_ATTACH,
                                                        &eth_dev);
@@ -646,9 +648,6 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
                }
        }
 
-       if (eth_dev)
-               eth_dev->device = &dev->device;
-
 out_free:
        rte_kvargs_free(kvlist);
        rte_free(info);
@@ -703,10 +702,3 @@ RTE_PMD_REGISTER_VDEV(net_ring, pmd_ring_drv);
 RTE_PMD_REGISTER_ALIAS(net_ring, eth_ring);
 RTE_PMD_REGISTER_PARAM_STRING(net_ring,
        ETH_RING_NUMA_NODE_ACTION_ARG "=name:node:action(ATTACH|CREATE)");
-
-RTE_INIT(eth_ring_init_log)
-{
-       eth_ring_logtype = rte_log_register("pmd.net.ring");
-       if (eth_ring_logtype >= 0)
-               rte_log_set_level(eth_ring_logtype, RTE_LOG_NOTICE);
-}