net/mlx5: change pkt burst select function prototype

Change the function prototype to return the function pointer of the
selected Tx/Rx burst function instead of assigning it directly to the
device context.

Such change will enable to use those select functions to query the burst
function that will be selected according to the device configuration.

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index cd66fe16211b99a3b105c12f6a0ce806340e99c5..0192815f2479d8834d9efe955f95a2c3e38d747a 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -712,8 +712,15 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
                                err = -err;
                                goto error;
                        }
-                       priv_dev_select_rx_function(priv, eth_dev);
-                       priv_dev_select_tx_function(priv, eth_dev);
+                       /*
+                        * Ethdev pointer is still required as input since
+                        * the primary device is not accessible from the
+                        * secondary process.
+                        */
+                       eth_dev->rx_pkt_burst =
+                               priv_select_rx_function(priv, eth_dev);
+                       eth_dev->tx_pkt_burst =
+                               priv_select_tx_function(priv, eth_dev);
                        continue;
                }
 

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index e6a69b8231bc677b2fe074e97a190de9f5c3fd03..3e3259b553e1b1162e96f753c727b2ef00d68b30 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -206,8 +206,8 @@ void priv_dev_interrupt_handler_uninstall(struct priv *, struct rte_eth_dev *);
 void priv_dev_interrupt_handler_install(struct priv *, struct rte_eth_dev *);
 int mlx5_set_link_down(struct rte_eth_dev *dev);
 int mlx5_set_link_up(struct rte_eth_dev *dev);
-void priv_dev_select_tx_function(struct priv *priv, struct rte_eth_dev *dev);
-void priv_dev_select_rx_function(struct priv *priv, struct rte_eth_dev *dev);
+eth_tx_burst_t priv_select_tx_function(struct priv *, struct rte_eth_dev *);
+eth_rx_burst_t priv_select_rx_function(struct priv *, struct rte_eth_dev *);
 
 /* mlx5_mac.c */
 

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 282ef241e75d68e0842728dd6e0f79aaddc31b99..28183534aae2e0c78ac8513b45bf6e4a55d3053c 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -1325,8 +1325,8 @@ priv_dev_set_link(struct priv *priv, struct rte_eth_dev *dev, int up)
                err = priv_set_flags(priv, ~IFF_UP, IFF_UP);
                if (err)
                        return err;
-               priv_dev_select_tx_function(priv, dev);
-               priv_dev_select_rx_function(priv, dev);
+               dev->tx_pkt_burst = priv_select_tx_function(priv, dev);
+               dev->rx_pkt_burst = priv_select_rx_function(priv, dev);
        } else {
                err = priv_set_flags(priv, ~IFF_UP, ~IFF_UP);
                if (err)
@@ -1386,32 +1386,36 @@ mlx5_set_link_up(struct rte_eth_dev *dev)
  *   Pointer to private data structure.
  * @param dev
  *   Pointer to rte_eth_dev structure.
+ *
+ * @return
+ *   Pointer to selected Tx burst function.
  */
-void
-priv_dev_select_tx_function(struct priv *priv, struct rte_eth_dev *dev)
+eth_tx_burst_t
+priv_select_tx_function(struct priv *priv, __rte_unused struct rte_eth_dev *dev)
 {
+       eth_tx_burst_t tx_pkt_burst = mlx5_tx_burst;
+
        assert(priv != NULL);
-       assert(dev != NULL);
-       dev->tx_pkt_burst = mlx5_tx_burst;
        /* Select appropriate TX function. */
        if (priv->mps == MLX5_MPW_ENHANCED) {
                if (priv_check_vec_tx_support(priv) > 0) {
                        if (priv_check_raw_vec_tx_support(priv) > 0)
-                               dev->tx_pkt_burst = mlx5_tx_burst_raw_vec;
+                               tx_pkt_burst = mlx5_tx_burst_raw_vec;
                        else
-                               dev->tx_pkt_burst = mlx5_tx_burst_vec;
+                               tx_pkt_burst = mlx5_tx_burst_vec;
                        DEBUG("selected Enhanced MPW TX vectorized function");
                } else {
-                       dev->tx_pkt_burst = mlx5_tx_burst_empw;
+                       tx_pkt_burst = mlx5_tx_burst_empw;
                        DEBUG("selected Enhanced MPW TX function");
                }
        } else if (priv->mps && priv->txq_inline) {
-               dev->tx_pkt_burst = mlx5_tx_burst_mpw_inline;
+               tx_pkt_burst = mlx5_tx_burst_mpw_inline;
                DEBUG("selected MPW inline TX function");
        } else if (priv->mps) {
-               dev->tx_pkt_burst = mlx5_tx_burst_mpw;
+               tx_pkt_burst = mlx5_tx_burst_mpw;
                DEBUG("selected MPW TX function");
        }
+       return tx_pkt_burst;
 }
 
 /**
@@ -1421,16 +1425,19 @@ priv_dev_select_tx_function(struct priv *priv, struct rte_eth_dev *dev)
  *   Pointer to private data structure.
  * @param dev
  *   Pointer to rte_eth_dev structure.
+ *
+ * @return
+ *   Pointer to selected Rx burst function.
  */
-void
-priv_dev_select_rx_function(struct priv *priv, struct rte_eth_dev *dev)
+eth_rx_burst_t
+priv_select_rx_function(struct priv *priv, __rte_unused struct rte_eth_dev *dev)
 {
+       eth_rx_burst_t rx_pkt_burst = mlx5_rx_burst;
+
        assert(priv != NULL);
-       assert(dev != NULL);
        if (priv_check_vec_rx_support(priv) > 0) {
-               dev->rx_pkt_burst = mlx5_rx_burst_vec;
+               rx_pkt_burst = mlx5_rx_burst_vec;
                DEBUG("selected RX vectorized function");
-       } else {
-               dev->rx_pkt_burst = mlx5_rx_burst;
        }
+       return rx_pkt_burst;
 }

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 88f60a01d47bd15ee5423380d73406f260ac463c..1a20967a20f7854cefbc7c165d459e8ba8508f34 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -152,7 +152,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                goto error;
        }
        /* Update send callback. */
-       priv_dev_select_tx_function(priv, dev);
+       dev->tx_pkt_burst = priv_select_tx_function(priv, dev);
        err = priv_rxq_start(priv);
        if (err) {
                ERROR("%p: RXQ allocation failed: %s",
@@ -160,7 +160,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                goto error;
        }
        /* Update receive callback. */
-       priv_dev_select_rx_function(priv, dev);
+       dev->rx_pkt_burst = priv_select_rx_function(priv, dev);
        err = priv_dev_traffic_enable(priv, dev);
        if (err) {
                ERROR("%p: an error occurred while configuring control flows:"