net/mlx5: fix rollback when starting device

[dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 90b8068..8c5aa69 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -33,14 +33,14 @@
 
 /* DPDK headers don't like -pedantic. */
 #ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
+#pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_interrupts.h>
 #include <rte_alarm.h>
 #ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
+#pragma GCC diagnostic error "-Wpedantic"
 #endif
 
 #include "mlx5.h"
@@ -64,6 +64,9 @@ mlx5_dev_start(struct rte_eth_dev *dev)
        struct priv *priv = dev->data->dev_private;
        int err;
 
+       if (mlx5_is_secondary())
+               return -E_RTE_SECONDARY;
+
        priv_lock(priv);
        if (priv->started) {
                priv_unlock(priv);
@@ -79,15 +82,33 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                ERROR("%p: an error occurred while configuring hash RX queues:"
                      " %s",
                      (void *)priv, strerror(err));
-               /* Rollback. */
-               priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_IPV6MULTI);
-               priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_BROADCAST);
-               priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_ALLMULTI);
-               priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_PROMISC);
-               priv_mac_addrs_disable(priv);
-               priv_destroy_hash_rxqs(priv);
+               goto error;
+       }
+       if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE)
+               priv_fdir_enable(priv);
+       err = priv_flow_start(priv);
+       if (err) {
+               priv->started = 0;
+               ERROR("%p: an error occurred while configuring flows:"
+                     " %s",
+                     (void *)priv, strerror(err));
+               goto error;
        }
        priv_dev_interrupt_handler_install(priv, dev);
+       if (dev->data->dev_conf.intr_conf.rxq) {
+               err = priv_intr_efd_enable(priv);
+               if (!err)
+                       err = priv_create_intr_vec(priv);
+       }
+       priv_xstats_init(priv);
+       priv_unlock(priv);
+       return 0;
+error:
+       /* Rollback. */
+       priv_special_flow_disable_all(priv);
+       priv_mac_addrs_disable(priv);
+       priv_destroy_hash_rxqs(priv);
+       priv_flow_stop(priv);
        priv_unlock(priv);
        return -err;
 }
@@ -105,19 +126,25 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
 {
        struct priv *priv = dev->data->dev_private;
 
+       if (mlx5_is_secondary())
+               return;
+
        priv_lock(priv);
        if (!priv->started) {
                priv_unlock(priv);
                return;
        }
        DEBUG("%p: cleaning up and destroying hash RX queues", (void *)dev);
-       priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_IPV6MULTI);
-       priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_BROADCAST);
-       priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_ALLMULTI);
-       priv_special_flow_disable(priv, HASH_RXQ_FLOW_TYPE_PROMISC);
+       priv_special_flow_disable_all(priv);
        priv_mac_addrs_disable(priv);
        priv_destroy_hash_rxqs(priv);
+       priv_fdir_disable(priv);
+       priv_flow_stop(priv);
        priv_dev_interrupt_handler_uninstall(priv, dev);
+       if (priv->dev->data->dev_conf.intr_conf.rxq) {
+               priv_destroy_intr_vec(priv);
+               priv_intr_efd_disable(priv);
+       }
        priv->started = 0;
        priv_unlock(priv);
 }