ethdev: add device flag to bypass auto-filled queue xstats

[dpdk.git] / drivers / net / mvneta / mvneta_ethdev.c

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index d46a13b..2cd7391 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -34,8 +34,6 @@
 /** Maximum length of a match string */
 #define MVNETA_MATCH_LEN 16
 
-int mvneta_logtype;
-
 static const char * const valid_args[] = {
        MVNETA_IFACE_NAME_ARG,
        NULL
@@ -48,7 +46,9 @@ struct mvneta_ifnames {
 
 static int mvneta_dev_num;
 
-static void mvneta_stats_reset(struct rte_eth_dev *dev);
+static int mvneta_stats_reset(struct rte_eth_dev *dev);
+static int rte_pmd_mvneta_remove(struct rte_vdev_device *vdev);
+
 
 /**
  * Deinitialize packet processor.
@@ -151,7 +151,7 @@ mvneta_dev_configure(struct rte_eth_dev *dev)
  * @param info
  *   Info structure output buffer.
  */
-static void
+static int
 mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
                   struct rte_eth_dev_info *info)
 {
@@ -185,6 +185,8 @@ mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        info->default_txconf.offloads = 0;
 
        info->max_rx_pktlen = MVNETA_PKT_SIZE_MAX;
+
+       return 0;
 }
 
 /**
@@ -406,19 +408,23 @@ out:
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+static int
 mvneta_dev_stop(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        if (!priv->ppio)
-               return;
+               return 0;
 
        mvneta_dev_set_link_down(dev);
        mvneta_flush_queues(dev);
        neta_ppio_deinit(priv->ppio);
 
        priv->ppio = NULL;
+
+       return 0;
 }
 
 /**
@@ -427,14 +433,17 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+static int
 mvneta_dev_close(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
-       int i;
+       int i, ret = 0;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
        if (priv->ppio)
-               mvneta_dev_stop(dev);
+               ret = mvneta_dev_stop(dev);
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                mvneta_rx_queue_release(dev->data->rx_queues[i]);
@@ -445,6 +454,16 @@ mvneta_dev_close(struct rte_eth_dev *dev)
                mvneta_tx_queue_release(dev->data->tx_queues[i]);
                dev->data->tx_queues[i] = NULL;
        }
+
+       mvneta_dev_num--;
+
+       if (mvneta_dev_num == 0) {
+               MVNETA_LOG(INFO, "Perform MUSDK deinit");
+               mvneta_neta_deinit();
+               rte_mvep_deinit(MVEP_MOD_T_NETA);
+       }
+
+       return ret;
 }
 
 /**
@@ -522,25 +541,30 @@ mvneta_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_enable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (en) {
                MVNETA_LOG(INFO, "Promiscuous already enabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 1);
        if (ret)
                MVNETA_LOG(ERR, "Failed to enable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -548,25 +572,30 @@ mvneta_promiscuous_enable(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0
  */
-static void
+static int
 mvneta_promiscuous_disable(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        int ret, en;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        neta_ppio_get_promisc(priv->ppio, &en);
        if (!en) {
                MVNETA_LOG(INFO, "Promiscuous already disabled");
-               return;
+               return 0;
        }
 
        ret = neta_ppio_set_promisc(priv->ppio, 0);
        if (ret)
                MVNETA_LOG(ERR, "Failed to disable promiscuous mode");
+
+       return 0;
 }
 
 /**
@@ -714,19 +743,24 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success, negative error value otherwise.
  */
-static void
+static int
 mvneta_stats_reset(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
        unsigned int ret;
 
        if (!priv->ppio)
-               return;
+               return 0;
 
        ret = mvneta_stats_get(dev, &priv->prev_stats);
        if (unlikely(ret))
-               RTE_LOG(ERR, PMD, "Failed to reset port statistics");
+               MVNETA_LOG(ERR, "Failed to reset port statistics");
+
+       return ret;
 }
 
 
@@ -802,11 +836,11 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
               req.ifr_addr.sa_data, RTE_ETHER_ADDR_LEN);
 
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->device = &vdev->device;
        eth_dev->rx_pkt_burst = mvneta_rx_pkt_burst;
        mvneta_set_tx_function(eth_dev);
        eth_dev->dev_ops = &mvneta_ops;
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        rte_eth_dev_probing_finish(eth_dev);
        return 0;
@@ -906,20 +940,16 @@ init_devices:
                ret = mvneta_eth_dev_create(vdev, ifnames.names[i]);
                if (ret)
                        goto out_cleanup;
+
+               mvneta_dev_num++;
        }
-       mvneta_dev_num += ifnum;
 
        rte_kvargs_free(kvlist);
 
        return 0;
 out_cleanup:
-       for (; i > 0; i--)
-               mvneta_eth_dev_destroy_name(ifnames.names[i]);
+       rte_pmd_mvneta_remove(vdev);
 
-       if (mvneta_dev_num == 0) {
-               mvneta_neta_deinit();
-               rte_mvep_deinit(MVEP_MOD_T_NETA);
-       }
 out_free_kvlist:
        rte_kvargs_free(kvlist);
 
@@ -938,30 +968,16 @@ out_free_kvlist:
 static int
 rte_pmd_mvneta_remove(struct rte_vdev_device *vdev)
 {
-       int i;
-       const char *name;
+       uint16_t port_id;
+       int ret = 0;
 
-       name = rte_vdev_device_name(vdev);
-       if (!name)
-               return -EINVAL;
-
-       MVNETA_LOG(INFO, "Removing %s", name);
-
-       RTE_ETH_FOREACH_DEV(i) {
-               if (rte_eth_devices[i].device != &vdev->device)
+       RTE_ETH_FOREACH_DEV(port_id) {
+               if (rte_eth_devices[port_id].device != &vdev->device)
                        continue;
-
-               mvneta_eth_dev_destroy(&rte_eth_devices[i]);
-               mvneta_dev_num--;
-       }
-
-       if (mvneta_dev_num == 0) {
-               MVNETA_LOG(INFO, "Perform MUSDK deinit");
-               mvneta_neta_deinit();
-               rte_mvep_deinit(MVEP_MOD_T_NETA);
+               ret |= rte_eth_dev_close(port_id);
        }
 
-       return 0;
+       return ret == 0 ? 0 : -EIO;
 }
 
 static struct rte_vdev_driver pmd_mvneta_drv = {
@@ -971,10 +987,4 @@ static struct rte_vdev_driver pmd_mvneta_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_mvneta, pmd_mvneta_drv);
 RTE_PMD_REGISTER_PARAM_STRING(net_mvneta, "iface=<ifc>");
-
-RTE_INIT(mvneta_init_log)
-{
-       mvneta_logtype = rte_log_register("pmd.net.mvneta");
-       if (mvneta_logtype >= 0)
-               rte_log_set_level(mvneta_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(mvneta_logtype, pmd.net.mvneta, NOTICE);