net/mlx5: select Rx/Tx callbacks when starting device

The callbacks are global to a device but the selection is made every queue
configuration, which is redundant.

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 039335e2e470c171cfb4d62ee66476632b95ded4..54c4c6caea910a72c1ceb387b750483606e5a879 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -923,8 +923,6 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        struct priv *priv = dev->data->dev_private;
        int ret = 0;
        unsigned int i;
-       uint16_t (*rx_func)(void *, struct rte_mbuf **, uint16_t) =
-               mlx5_rx_burst;
        unsigned int max_frame_len;
        int rehash;
        int restart = priv->started;
@@ -944,7 +942,7 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
        /* Temporarily replace RX handler with a fake one, assuming it has not
         * been copied elsewhere. */
        dev->rx_pkt_burst = removed_rx_burst;
-       /* Make sure everyone has left mlx5_rx_burst() and uses
+       /* Make sure everyone has left dev->rx_pkt_burst() and uses
         * removed_rx_burst() instead. */
        rte_wmb();
        usleep(1000);
@@ -1018,17 +1016,13 @@ recover:
                /* Double fault, disable RX. */
                break;
        }
-       /*
-        * Use a safe RX burst function in case of error, otherwise mimic
-        * mlx5_dev_start().
-        */
+       /* Mimic mlx5_dev_start(). */
        if (ret) {
                ERROR("unable to reconfigure RX queues, RX disabled");
-               rx_func = removed_rx_burst;
        } else if (restart &&
-                !rehash &&
-                !priv_create_hash_rxqs(priv) &&
-                !priv_rehash_flows(priv)) {
+                  !rehash &&
+                  !priv_create_hash_rxqs(priv) &&
+                  !priv_rehash_flows(priv)) {
                if (dev->data->dev_conf.fdir_conf.mode == RTE_FDIR_MODE_NONE)
                        priv_fdir_enable(priv);
                priv_dev_interrupt_handler_install(priv, dev);
@@ -1036,7 +1030,12 @@ recover:
        priv->mtu = mtu;
        /* Burst functions can now be called again. */
        rte_wmb();
-       dev->rx_pkt_burst = rx_func;
+       /*
+        * Use a safe RX burst function in case of error, otherwise select RX
+        * burst function again.
+        */
+       if (!ret)
+               priv_select_rx_function(priv);
 out:
        priv_unlock(priv);
        assert(ret >= 0);

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 22be999e8b359320f1d6fce8037a520895b73f8b..98b20eb92b82b48b1da26ffc53002cc81594fe03 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1226,8 +1226,6 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                DEBUG("%p: adding RX queue %p to list",
                      (void *)dev, (void *)rxq_ctrl);
                (*priv->rxqs)[idx] = &rxq_ctrl->rxq;
-               /* Update receive callback. */
-               priv_select_rx_function(priv);
        }
        priv_unlock(priv);
        return -ret;

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 40f23da93a1691bda9508228cdefb50f60097eee..595a9e064a347ed8ba6e766bf1e6182e0cab5751 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -72,6 +72,9 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                priv_unlock(priv);
                return 0;
        }
+       /* Update Rx/Tx callback. */
+       priv_select_tx_function(priv);
+       priv_select_rx_function(priv);
        DEBUG("%p: allocating and configuring hash RX queues", (void *)dev);
        err = priv_create_hash_rxqs(priv);
        if (!err)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index ac9dfc5f0c7315299829b00f6927c39e84b6a62a..03e23f58d0ba249d23304f004643df8a5a9b1de6 100644 (file)
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -496,8 +496,6 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                DEBUG("%p: adding TX queue %p to list",
                      (void *)dev, (void *)txq_ctrl);
                (*priv->txqs)[idx] = &txq_ctrl->txq;
-               /* Update send callback. */
-               priv_select_tx_function(priv);
        }
        priv_unlock(priv);
        return -ret;