net/mlx5: fix port attach in secondary process

Currently, the secondary process port UAR register mapping used by Tx
queue is done during port initializing.

Unluckily, in port hot-plug case, the secondary process was requested
to initialize the port when primary process did not complete the
device configuration and the port Tx queue number is not configured
yet. Hence, the secondary process gets the zero Tx queue number during
probing, causing the UAR registers not be mapped in the correct
fashion.

This commit checks the configured number of Tx queues in secondary
process when the port start is requested. In case the Tx queue
number mismatch found the UAR mapping is reinitialized accordingly.

Fixes: 2aac5b5d119f ("net/mlx5: sync stop/start with secondary process")
Cc: stable@dpdk.org
Signed-off-by: Suanming Mou <suanmingm@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c b/drivers/net/mlx5/linux/mlx5_mp_os.c
index 60fdee22a1698d4674f90075d670036b92cf6c9d..8011ca87d71df54114ba18ffa39dbaa65cf5eb8a 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_mp_os.c
+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c
@@ -115,6 +115,7 @@ struct rte_mp_msg mp_res;
        const struct mlx5_mp_param *param =
                (const struct mlx5_mp_param *)mp_msg->param;
        struct rte_eth_dev *dev;
+       struct mlx5_proc_priv *ppriv;
        struct mlx5_priv *priv;
        int ret;
 
@@ -132,6 +133,20 @@ struct rte_mp_msg mp_res;
                rte_mb();
                dev->rx_pkt_burst = mlx5_select_rx_function(dev);
                dev->tx_pkt_burst = mlx5_select_tx_function(dev);
+               ppriv = (struct mlx5_proc_priv *)dev->process_private;
+               /* If Tx queue number changes, re-initialize UAR. */
+               if (ppriv->uar_table_sz != priv->txqs_n) {
+                       mlx5_tx_uar_uninit_secondary(dev);
+                       mlx5_proc_priv_uninit(dev);
+                       ret = mlx5_proc_priv_init(dev);
+                       if (ret)
+                               return -rte_errno;
+                       ret = mlx5_tx_uar_init_secondary(dev, mp_msg->fds[0]);
+                       if (ret) {
+                               mlx5_proc_priv_uninit(dev);
+                               return -rte_errno;
+                       }
+               }
                mp_init_msg(&priv->mp_id, &mp_res, param->type);
                res->result = 0;
                ret = rte_mp_reply(&mp_res, peer);
@@ -183,6 +198,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum mlx5_mp_req_type type)
                return;
        }
        mp_init_msg(&priv->mp_id, &mp_req, type);
+       if (type == MLX5_MP_REQ_START_RXTX) {
+               mp_req.num_fds = 1;
+               mp_req.fds[0] = ((struct ibv_context *)priv->sh->ctx)->cmd_fd;
+       }
        ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
        if (ret) {
                if (rte_errno != ENOTSUP)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 93629e5b0585d511564c5c9dbeccc8fc1883ec76..aae2ef9af7370e336ada24dfaf2ce9b9ed61be02 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1268,7 +1268,7 @@ mlx5_proc_priv_init(struct rte_eth_dev *dev)
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+void
 mlx5_proc_priv_uninit(struct rte_eth_dev *dev)
 {
        if (!dev->process_private)

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 4bbf628885d15bd7e614fbeb4716319f99543323..5196a9ea76b276181691cbde595266eb7aa11a23 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -743,7 +743,10 @@ struct mlx5_dev_ctx_shared {
        struct mlx5_dev_shared_port port[]; /* per device port data array. */
 };
 
-/* Per-process private structure. */
+/*
+ * Per-process private structure.
+ * Caution, secondary process may rebuild the struct during port start.
+ */
 struct mlx5_proc_priv {
        size_t uar_table_sz;
        /* Size of UAR register table. */
@@ -998,6 +1001,7 @@ struct rte_hairpin_peer_info {
 
 int mlx5_getenv_int(const char *);
 int mlx5_proc_priv_init(struct rte_eth_dev *dev);
+void mlx5_proc_priv_uninit(struct rte_eth_dev *dev);
 int mlx5_udp_tunnel_port_add(struct rte_eth_dev *dev,
                              struct rte_eth_udp_tunnel *udp_tunnel);
 uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_pci_device *pci_dev);