net/mlx5: fix crash during RETA update

[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 51c31aa..eeb9585 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -30,6 +30,7 @@
  *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <unistd.h>
 
 #include <rte_ether.h>
 #include <rte_ethdev.h>
@@ -61,10 +62,6 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                return -E_RTE_SECONDARY;
 
        priv_lock(priv);
-       if (priv->started) {
-               priv_unlock(priv);
-               return 0;
-       }
        /* Update Rx/Tx callback. */
        priv_dev_select_tx_function(priv, dev);
        priv_dev_select_rx_function(priv, dev);
@@ -72,19 +69,14 @@ mlx5_dev_start(struct rte_eth_dev *dev)
        err = priv_create_hash_rxqs(priv);
        if (!err)
                err = priv_rehash_flows(priv);
-       if (!err)
-               priv->started = 1;
        else {
                ERROR("%p: an error occurred while configuring hash RX queues:"
                      " %s",
                      (void *)priv, strerror(err));
                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));
@@ -127,18 +119,18 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
                return;
 
        priv_lock(priv);
-       if (!priv->started) {
-               priv_unlock(priv);
-               return;
-       }
+       dev->data->dev_started = 0;
+       /* Prevent crashes when queues are still in use. */
+       dev->rx_pkt_burst = removed_rx_burst;
+       dev->tx_pkt_burst = removed_tx_burst;
+       rte_wmb();
+       usleep(1000 * priv->rxqs_n);
        DEBUG("%p: cleaning up and destroying hash RX queues", (void *)dev);
        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_rx_intr_vec_disable(priv);
        priv_dev_interrupt_handler_uninstall(priv, dev);
-       priv->started = 0;
        priv_unlock(priv);
 }