common/mlx5: fix external memory pool registration
[dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c
index 001c0b5..1952d68 100644 (file)
@@ -14,7 +14,7 @@
 #include <mlx5_malloc.h>
 
 #include "mlx5.h"
-#include "mlx5_mr.h"
+#include "mlx5_flow.h"
 #include "mlx5_rx.h"
 #include "mlx5_tx.h"
 #include "mlx5_utils.h"
@@ -105,6 +105,61 @@ error:
        return -rte_errno;
 }
 
+/**
+ * Translate the chunk address to MR key in order to put in into the cache.
+ */
+static void
+mlx5_rxq_mempool_register_cb(struct rte_mempool *mp, void *opaque,
+                            struct rte_mempool_memhdr *memhdr,
+                            unsigned int idx)
+{
+       struct mlx5_rxq_data *rxq = opaque;
+
+       RTE_SET_USED(mp);
+       RTE_SET_USED(idx);
+       mlx5_rx_addr2mr(rxq, (uintptr_t)memhdr->addr);
+}
+
+/**
+ * Register Rx queue mempools and fill the Rx queue cache.
+ * This function tolerates repeated mempool registration.
+ *
+ * @param[in] rxq_ctrl
+ *   Rx queue control data.
+ *
+ * @return
+ *   0 on success, (-1) on failure and rte_errno is set.
+ */
+static int
+mlx5_rxq_mempool_register(struct mlx5_rxq_ctrl *rxq_ctrl)
+{
+       struct rte_mempool *mp;
+       uint32_t s;
+       int ret = 0;
+
+       mlx5_mr_flush_local_cache(&rxq_ctrl->rxq.mr_ctrl);
+       /* MPRQ mempool is registered on creation, just fill the cache. */
+       if (mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq)) {
+               rte_mempool_mem_iter(rxq_ctrl->rxq.mprq_mp,
+                                    mlx5_rxq_mempool_register_cb,
+                                    &rxq_ctrl->rxq);
+               return 0;
+       }
+       for (s = 0; s < rxq_ctrl->rxq.rxseg_n; s++) {
+               uint32_t flags;
+
+               mp = rxq_ctrl->rxq.rxseg[s].mp;
+               flags = rte_pktmbuf_priv_flags(mp);
+               ret = mlx5_mr_mempool_register(rxq_ctrl->sh->cdev, mp);
+               if (ret < 0 && rte_errno != EEXIST)
+                       return ret;
+               if ((flags & RTE_PKTMBUF_POOL_F_PINNED_EXT_BUF) == 0)
+                       rte_mempool_mem_iter(mp, mlx5_rxq_mempool_register_cb,
+                                       &rxq_ctrl->rxq);
+       }
+       return 0;
+}
+
 /**
  * Stop traffic on Rx queues.
  *
@@ -121,6 +176,39 @@ mlx5_rxq_stop(struct rte_eth_dev *dev)
                mlx5_rxq_release(dev, i);
 }
 
+static int
+mlx5_rxq_ctrl_prepare(struct rte_eth_dev *dev, struct mlx5_rxq_ctrl *rxq_ctrl,
+                     unsigned int idx)
+{
+       int ret = 0;
+
+       if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD) {
+               /*
+                * Pre-register the mempools. Regardless of whether
+                * the implicit registration is enabled or not,
+                * Rx mempool destruction is tracked to free MRs.
+                */
+               if (mlx5_rxq_mempool_register(rxq_ctrl) < 0)
+                       return -rte_errno;
+               ret = rxq_alloc_elts(rxq_ctrl);
+               if (ret)
+                       return ret;
+       }
+       MLX5_ASSERT(!rxq_ctrl->obj);
+       rxq_ctrl->obj = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
+                                   sizeof(*rxq_ctrl->obj), 0,
+                                   rxq_ctrl->socket);
+       if (!rxq_ctrl->obj) {
+               DRV_LOG(ERR, "Port %u Rx queue %u can't allocate resources.",
+                       dev->data->port_id, idx);
+               rte_errno = ENOMEM;
+               return -rte_errno;
+       }
+       DRV_LOG(DEBUG, "Port %u rxq %u updated with %p.", dev->data->port_id,
+               idx, (void *)&rxq_ctrl->obj);
+       return 0;
+}
+
 /**
  * Start traffic on Rx queues.
  *
@@ -147,46 +235,24 @@ mlx5_rxq_start(struct rte_eth_dev *dev)
        DRV_LOG(DEBUG, "Port %u device_attr.max_sge is %d.",
                dev->data->port_id, priv->sh->device_attr.max_sge);
        for (i = 0; i != priv->rxqs_n; ++i) {
-               struct mlx5_rxq_ctrl *rxq_ctrl = mlx5_rxq_get(dev, i);
+               struct mlx5_rxq_priv *rxq = mlx5_rxq_ref(dev, i);
+               struct mlx5_rxq_ctrl *rxq_ctrl;
 
-               if (!rxq_ctrl)
+               if (rxq == NULL)
                        continue;
-               if (rxq_ctrl->type == MLX5_RXQ_TYPE_STANDARD) {
-                       /* Pre-register Rx mempools. */
-                       if (mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq)) {
-                               mlx5_mr_update_mp(dev, &rxq_ctrl->rxq.mr_ctrl,
-                                                 rxq_ctrl->rxq.mprq_mp);
-                       } else {
-                               uint32_t s;
-
-                               for (s = 0; s < rxq_ctrl->rxq.rxseg_n; s++)
-                                       mlx5_mr_update_mp
-                                               (dev, &rxq_ctrl->rxq.mr_ctrl,
-                                               rxq_ctrl->rxq.rxseg[s].mp);
-                       }
-                       ret = rxq_alloc_elts(rxq_ctrl);
-                       if (ret)
+               rxq_ctrl = rxq->ctrl;
+               if (!rxq_ctrl->started) {
+                       if (mlx5_rxq_ctrl_prepare(dev, rxq_ctrl, i) < 0)
                                goto error;
+                       LIST_INSERT_HEAD(&priv->rxqsobj, rxq_ctrl->obj, next);
                }
-               MLX5_ASSERT(!rxq_ctrl->obj);
-               rxq_ctrl->obj = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
-                                           sizeof(*rxq_ctrl->obj), 0,
-                                           rxq_ctrl->socket);
-               if (!rxq_ctrl->obj) {
-                       DRV_LOG(ERR,
-                               "Port %u Rx queue %u can't allocate resources.",
-                               dev->data->port_id, (*priv->rxqs)[i]->idx);
-                       rte_errno = ENOMEM;
-                       goto error;
-               }
-               ret = priv->obj_ops.rxq_obj_new(dev, i);
+               ret = priv->obj_ops.rxq_obj_new(rxq);
                if (ret) {
                        mlx5_free(rxq_ctrl->obj);
+                       rxq_ctrl->obj = NULL;
                        goto error;
                }
-               DRV_LOG(DEBUG, "Port %u rxq %u updated with %p.",
-                       dev->data->port_id, i, (void *)&rxq_ctrl->obj);
-               LIST_INSERT_HEAD(&priv->rxqsobj, rxq_ctrl->obj, next);
+               rxq_ctrl->started = true;
        }
        return 0;
 error:
@@ -216,6 +282,7 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
        struct mlx5_devx_modify_sq_attr sq_attr = { 0 };
        struct mlx5_devx_modify_rq_attr rq_attr = { 0 };
        struct mlx5_txq_ctrl *txq_ctrl;
+       struct mlx5_rxq_priv *rxq;
        struct mlx5_rxq_ctrl *rxq_ctrl;
        struct mlx5_devx_obj *sq;
        struct mlx5_devx_obj *rq;
@@ -228,12 +295,11 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
                txq_ctrl = mlx5_txq_get(dev, i);
                if (!txq_ctrl)
                        continue;
-               if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN) {
+               if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN ||
+                   txq_ctrl->hairpin_conf.peers[0].port != self_port) {
                        mlx5_txq_release(dev, i);
                        continue;
                }
-               if (txq_ctrl->hairpin_conf.peers[0].port != self_port)
-                       continue;
                if (txq_ctrl->hairpin_conf.manual_bind) {
                        mlx5_txq_release(dev, i);
                        return 0;
@@ -247,13 +313,12 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
                txq_ctrl = mlx5_txq_get(dev, i);
                if (!txq_ctrl)
                        continue;
-               if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN) {
+               /* Skip hairpin queues with other peer ports. */
+               if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN ||
+                   txq_ctrl->hairpin_conf.peers[0].port != self_port) {
                        mlx5_txq_release(dev, i);
                        continue;
                }
-               /* Skip hairpin queues with other peer ports. */
-               if (txq_ctrl->hairpin_conf.peers[0].port != self_port)
-                       continue;
                if (!txq_ctrl->obj) {
                        rte_errno = ENOMEM;
                        DRV_LOG(ERR, "port %u no txq object found: %d",
@@ -262,9 +327,8 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
                        return -rte_errno;
                }
                sq = txq_ctrl->obj->sq;
-               rxq_ctrl = mlx5_rxq_get(dev,
-                                       txq_ctrl->hairpin_conf.peers[0].queue);
-               if (!rxq_ctrl) {
+               rxq = mlx5_rxq_get(dev, txq_ctrl->hairpin_conf.peers[0].queue);
+               if (rxq == NULL) {
                        mlx5_txq_release(dev, i);
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u no rxq object found: %d",
@@ -272,8 +336,9 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
                                txq_ctrl->hairpin_conf.peers[0].queue);
                        return -rte_errno;
                }
+               rxq_ctrl = rxq->ctrl;
                if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN ||
-                   rxq_ctrl->hairpin_conf.peers[0].queue != i) {
+                   rxq->hairpin_conf.peers[0].queue != i) {
                        rte_errno = ENOMEM;
                        DRV_LOG(ERR, "port %u Tx queue %d can't be binded to "
                                "Rx queue %d", dev->data->port_id,
@@ -303,15 +368,13 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
                if (ret)
                        goto error;
                /* Qs with auto-bind will be destroyed directly. */
-               rxq_ctrl->hairpin_status = 1;
+               rxq->hairpin_status = 1;
                txq_ctrl->hairpin_status = 1;
                mlx5_txq_release(dev, i);
-               mlx5_rxq_release(dev, txq_ctrl->hairpin_conf.peers[0].queue);
        }
        return 0;
 error:
        mlx5_txq_release(dev, i);
-       mlx5_rxq_release(dev, txq_ctrl->hairpin_conf.peers[0].queue);
        return -rte_errno;
 }
 
@@ -384,35 +447,33 @@ mlx5_hairpin_queue_peer_update(struct rte_eth_dev *dev, uint16_t peer_queue,
                peer_info->manual_bind = txq_ctrl->hairpin_conf.manual_bind;
                mlx5_txq_release(dev, peer_queue);
        } else { /* Peer port used as ingress. */
+               struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, peer_queue);
                struct mlx5_rxq_ctrl *rxq_ctrl;
 
-               rxq_ctrl = mlx5_rxq_get(dev, peer_queue);
-               if (rxq_ctrl == NULL) {
+               if (rxq == NULL) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "Failed to get port %u Rx queue %d",
                                dev->data->port_id, peer_queue);
                        return -rte_errno;
                }
+               rxq_ctrl = rxq->ctrl;
                if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u queue %d is not a hairpin Rxq",
                                dev->data->port_id, peer_queue);
-                       mlx5_rxq_release(dev, peer_queue);
                        return -rte_errno;
                }
                if (rxq_ctrl->obj == NULL || rxq_ctrl->obj->rq == NULL) {
                        rte_errno = ENOMEM;
                        DRV_LOG(ERR, "port %u no Rxq object found: %d",
                                dev->data->port_id, peer_queue);
-                       mlx5_rxq_release(dev, peer_queue);
                        return -rte_errno;
                }
                peer_info->qp_id = rxq_ctrl->obj->rq->id;
                peer_info->vhca_id = priv->config.hca_attr.vhca_id;
-               peer_info->peer_q = rxq_ctrl->hairpin_conf.peers[0].queue;
-               peer_info->tx_explicit = rxq_ctrl->hairpin_conf.tx_explicit;
-               peer_info->manual_bind = rxq_ctrl->hairpin_conf.manual_bind;
-               mlx5_rxq_release(dev, peer_queue);
+               peer_info->peer_q = rxq->hairpin_conf.peers[0].queue;
+               peer_info->tx_explicit = rxq->hairpin_conf.tx_explicit;
+               peer_info->manual_bind = rxq->hairpin_conf.manual_bind;
        }
        return 0;
 }
@@ -511,50 +572,46 @@ mlx5_hairpin_queue_peer_bind(struct rte_eth_dev *dev, uint16_t cur_queue,
                        txq_ctrl->hairpin_status = 1;
                mlx5_txq_release(dev, cur_queue);
        } else {
+               struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, cur_queue);
                struct mlx5_rxq_ctrl *rxq_ctrl;
                struct mlx5_devx_modify_rq_attr rq_attr = { 0 };
 
-               rxq_ctrl = mlx5_rxq_get(dev, cur_queue);
-               if (rxq_ctrl == NULL) {
+               if (rxq == NULL) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "Failed to get port %u Rx queue %d",
                                dev->data->port_id, cur_queue);
                        return -rte_errno;
                }
+               rxq_ctrl = rxq->ctrl;
                if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u queue %d not a hairpin Rxq",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
                if (rxq_ctrl->obj == NULL || rxq_ctrl->obj->rq == NULL) {
                        rte_errno = ENOMEM;
                        DRV_LOG(ERR, "port %u no Rxq object found: %d",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
-               if (rxq_ctrl->hairpin_status != 0) {
+               if (rxq->hairpin_status != 0) {
                        DRV_LOG(DEBUG, "port %u Rx queue %d is already bound",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return 0;
                }
                if (peer_info->tx_explicit !=
-                   rxq_ctrl->hairpin_conf.tx_explicit) {
+                   rxq->hairpin_conf.tx_explicit) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u Rx queue %d and peer Tx rule mode"
                                " mismatch", dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
                if (peer_info->manual_bind !=
-                   rxq_ctrl->hairpin_conf.manual_bind) {
+                   rxq->hairpin_conf.manual_bind) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u Rx queue %d and peer binding mode"
                                " mismatch", dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
                rq_attr.state = MLX5_SQC_STATE_RDY;
@@ -563,8 +620,7 @@ mlx5_hairpin_queue_peer_bind(struct rte_eth_dev *dev, uint16_t cur_queue,
                rq_attr.hairpin_peer_vhca = peer_info->vhca_id;
                ret = mlx5_devx_cmd_modify_rq(rxq_ctrl->obj->rq, &rq_attr);
                if (ret == 0)
-                       rxq_ctrl->hairpin_status = 1;
-               mlx5_rxq_release(dev, cur_queue);
+                       rxq->hairpin_status = 1;
        }
        return ret;
 }
@@ -629,42 +685,39 @@ mlx5_hairpin_queue_peer_unbind(struct rte_eth_dev *dev, uint16_t cur_queue,
                        txq_ctrl->hairpin_status = 0;
                mlx5_txq_release(dev, cur_queue);
        } else {
+               struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, cur_queue);
                struct mlx5_rxq_ctrl *rxq_ctrl;
                struct mlx5_devx_modify_rq_attr rq_attr = { 0 };
 
-               rxq_ctrl = mlx5_rxq_get(dev, cur_queue);
-               if (rxq_ctrl == NULL) {
+               if (rxq == NULL) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "Failed to get port %u Rx queue %d",
                                dev->data->port_id, cur_queue);
                        return -rte_errno;
                }
+               rxq_ctrl = rxq->ctrl;
                if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN) {
                        rte_errno = EINVAL;
                        DRV_LOG(ERR, "port %u queue %d not a hairpin Rxq",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
-               if (rxq_ctrl->hairpin_status == 0) {
+               if (rxq->hairpin_status == 0) {
                        DRV_LOG(DEBUG, "port %u Rx queue %d is already unbound",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return 0;
                }
                if (rxq_ctrl->obj == NULL || rxq_ctrl->obj->rq == NULL) {
                        rte_errno = ENOMEM;
                        DRV_LOG(ERR, "port %u no Rxq object found: %d",
                                dev->data->port_id, cur_queue);
-                       mlx5_rxq_release(dev, cur_queue);
                        return -rte_errno;
                }
                rq_attr.state = MLX5_SQC_STATE_RST;
                rq_attr.rq_state = MLX5_SQC_STATE_RST;
                ret = mlx5_devx_cmd_modify_rq(rxq_ctrl->obj->rq, &rq_attr);
                if (ret == 0)
-                       rxq_ctrl->hairpin_status = 0;
-               mlx5_rxq_release(dev, cur_queue);
+                       rxq->hairpin_status = 0;
        }
        return ret;
 }
@@ -697,7 +750,7 @@ mlx5_hairpin_bind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)
        uint32_t explicit;
        uint16_t rx_queue;
 
-       if (mlx5_eth_find_next(rx_port, priv->pci_dev) != rx_port) {
+       if (mlx5_eth_find_next(rx_port, dev->device) != rx_port) {
                rte_errno = ENODEV;
                DRV_LOG(ERR, "Rx port %u does not belong to mlx5", rx_port);
                return -rte_errno;
@@ -835,7 +888,7 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)
        int ret;
        uint16_t cur_port = priv->dev_data->port_id;
 
-       if (mlx5_eth_find_next(rx_port, priv->pci_dev) != rx_port) {
+       if (mlx5_eth_find_next(rx_port, dev->device) != rx_port) {
                rte_errno = ENODEV;
                DRV_LOG(ERR, "Rx port %u does not belong to mlx5", rx_port);
                return -rte_errno;
@@ -893,7 +946,6 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)
 {
        int ret = 0;
        uint16_t p, pp;
-       struct mlx5_priv *priv = dev->data->dev_private;
 
        /*
         * If the Rx port has no hairpin configuration with the current port,
@@ -902,7 +954,7 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)
         * information updating.
         */
        if (rx_port == RTE_MAX_ETHPORTS) {
-               MLX5_ETH_FOREACH_DEV(p, priv->pci_dev) {
+               MLX5_ETH_FOREACH_DEV(p, dev->device) {
                        ret = mlx5_hairpin_bind_single_port(dev, p);
                        if (ret != 0)
                                goto unbind;
@@ -912,7 +964,7 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)
                return mlx5_hairpin_bind_single_port(dev, rx_port);
        }
 unbind:
-       MLX5_ETH_FOREACH_DEV(pp, priv->pci_dev)
+       MLX5_ETH_FOREACH_DEV(pp, dev->device)
                if (pp < p)
                        mlx5_hairpin_unbind_single_port(dev, pp);
        return ret;
@@ -927,10 +979,9 @@ mlx5_hairpin_unbind(struct rte_eth_dev *dev, uint16_t rx_port)
 {
        int ret = 0;
        uint16_t p;
-       struct mlx5_priv *priv = dev->data->dev_private;
 
        if (rx_port == RTE_MAX_ETHPORTS)
-               MLX5_ETH_FOREACH_DEV(p, priv->pci_dev) {
+               MLX5_ETH_FOREACH_DEV(p, dev->device) {
                        ret = mlx5_hairpin_unbind_single_port(dev, p);
                        if (ret != 0)
                                return ret;
@@ -968,7 +1019,6 @@ mlx5_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_txq_ctrl *txq_ctrl;
-       struct mlx5_rxq_ctrl *rxq_ctrl;
        uint32_t i;
        uint16_t pp;
        uint32_t bits[(RTE_MAX_ETHPORTS + 31) / 32] = {0};
@@ -997,24 +1047,23 @@ mlx5_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,
                }
        } else {
                for (i = 0; i < priv->rxqs_n; i++) {
-                       rxq_ctrl = mlx5_rxq_get(dev, i);
-                       if (!rxq_ctrl)
+                       struct mlx5_rxq_priv *rxq = mlx5_rxq_get(dev, i);
+                       struct mlx5_rxq_ctrl *rxq_ctrl;
+
+                       if (rxq == NULL)
                                continue;
-                       if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN) {
-                               mlx5_rxq_release(dev, i);
+                       rxq_ctrl = rxq->ctrl;
+                       if (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN)
                                continue;
-                       }
-                       pp = rxq_ctrl->hairpin_conf.peers[0].port;
+                       pp = rxq->hairpin_conf.peers[0].port;
                        if (pp >= RTE_MAX_ETHPORTS) {
                                rte_errno = ERANGE;
-                               mlx5_rxq_release(dev, i);
                                DRV_LOG(ERR, "port %hu queue %u peer port "
                                        "out of range %hu",
                                        priv->dev_data->port_id, i, pp);
                                return -rte_errno;
                        }
                        bits[pp / 32] |= 1 << (pp % 32);
-                       mlx5_rxq_release(dev, i);
                }
        }
        for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
@@ -1068,12 +1117,36 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                        dev->data->port_id, strerror(rte_errno));
                goto error;
        }
+       if ((priv->sh->devx && priv->config.dv_flow_en &&
+           priv->config.dest_tir) && priv->obj_ops.lb_dummy_queue_create) {
+               ret = priv->obj_ops.lb_dummy_queue_create(dev);
+               if (ret)
+                       goto error;
+       }
        ret = mlx5_txq_start(dev);
        if (ret) {
                DRV_LOG(ERR, "port %u Tx queue allocation failed: %s",
                        dev->data->port_id, strerror(rte_errno));
                goto error;
        }
+       if (priv->config.std_delay_drop || priv->config.hp_delay_drop) {
+               if (!priv->config.vf && !priv->config.sf &&
+                   !priv->representor) {
+                       ret = mlx5_get_flag_dropless_rq(dev);
+                       if (ret < 0)
+                               DRV_LOG(WARNING,
+                                       "port %u cannot query dropless flag",
+                                       dev->data->port_id);
+                       else if (!ret)
+                               DRV_LOG(WARNING,
+                                       "port %u dropless_rq OFF, no rearming",
+                                       dev->data->port_id);
+               } else {
+                       DRV_LOG(DEBUG,
+                               "port %u doesn't support dropless_rq flag",
+                               dev->data->port_id);
+               }
+       }
        ret = mlx5_rxq_start(dev);
        if (ret) {
                DRV_LOG(ERR, "port %u Rx queue allocation failed: %s",
@@ -1111,6 +1184,14 @@ mlx5_dev_start(struct rte_eth_dev *dev)
        mlx5_rxq_timestamp_set(dev);
        /* Set a mask and offset of scheduling on timestamp into Tx queues. */
        mlx5_txq_dynf_timestamp_set(dev);
+       /* Attach indirection table objects detached on port stop. */
+       ret = mlx5_action_handle_attach(dev);
+       if (ret) {
+               DRV_LOG(ERR,
+                       "port %u failed to attach indirect actions: %s",
+                       dev->data->port_id, rte_strerror(rte_errno));
+               goto error;
+       }
        /*
         * In non-cached mode, it only needs to start the default mreg copy
         * action and no flow created by application exists anymore.
@@ -1122,12 +1203,17 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                        dev->data->port_id, strerror(rte_errno));
                goto error;
        }
+       if (mlx5_dev_ctx_shared_mempool_subscribe(dev) != 0) {
+               DRV_LOG(ERR, "port %u failed to subscribe for mempool life cycle: %s",
+                       dev->data->port_id, rte_strerror(rte_errno));
+               goto error;
+       }
        rte_wmb();
        dev->tx_pkt_burst = mlx5_select_tx_function(dev);
        dev->rx_pkt_burst = mlx5_select_rx_function(dev);
        /* Enable datapath on secondary process. */
        mlx5_mp_os_req_start_rxtx(dev);
-       if (priv->sh->intr_handle.fd >= 0) {
+       if (rte_intr_fd_get(priv->sh->intr_handle) >= 0) {
                priv->sh->port[priv->dev_port - 1].ih_port_id =
                                        (uint32_t)dev->data->port_id;
        } else {
@@ -1136,7 +1222,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)
                dev->data->dev_conf.intr_conf.lsc = 0;
                dev->data->dev_conf.intr_conf.rmv = 0;
        }
-       if (priv->sh->intr_handle_devx.fd >= 0)
+       if (rte_intr_fd_get(priv->sh->intr_handle_devx) >= 0)
                priv->sh->port[priv->dev_port - 1].devx_ih_port_id =
                                        (uint32_t)dev->data->port_id;
        return 0;
@@ -1148,6 +1234,8 @@ error:
        mlx5_traffic_disable(dev);
        mlx5_txq_stop(dev);
        mlx5_rxq_stop(dev);
+       if (priv->obj_ops.lb_dummy_queue_release)
+               priv->obj_ops.lb_dummy_queue_release(dev);
        mlx5_txpp_stop(dev); /* Stop last. */
        rte_errno = ret; /* Restore rte_errno. */
        return -rte_errno;
@@ -1179,12 +1267,16 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
        /* Control flows for default traffic can be removed firstly. */
        mlx5_traffic_disable(dev);
        /* All RX queue flags will be cleared in the flush interface. */
-       mlx5_flow_list_flush(dev, &priv->flows, true);
+       mlx5_flow_list_flush(dev, MLX5_FLOW_TYPE_GEN, true);
+       mlx5_flow_meter_rxq_flush(dev);
+       mlx5_action_handle_detach(dev);
        mlx5_rx_intr_vec_disable(dev);
        priv->sh->port[priv->dev_port - 1].ih_port_id = RTE_MAX_ETHPORTS;
        priv->sh->port[priv->dev_port - 1].devx_ih_port_id = RTE_MAX_ETHPORTS;
        mlx5_txq_stop(dev);
        mlx5_rxq_stop(dev);
+       if (priv->obj_ops.lb_dummy_queue_release)
+               priv->obj_ops.lb_dummy_queue_release(dev);
        mlx5_txpp_stop(dev);
 
        return 0;
@@ -1248,9 +1340,18 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
                                goto error;
                        }
                }
+               if ((priv->representor || priv->master) &&
+                   priv->config.dv_esw_en) {
+                       if (mlx5_flow_create_devx_sq_miss_flow(dev, i) == 0) {
+                               DRV_LOG(ERR,
+                                       "Port %u Tx queue %u SQ create representor devx default miss rule failed.",
+                                       dev->data->port_id, i);
+                               goto error;
+                       }
+               }
                mlx5_txq_release(dev, i);
        }
-       if (priv->config.dv_esw_en && !priv->config.vf) {
+       if ((priv->master || priv->representor) && priv->config.dv_esw_en) {
                if (mlx5_flow_create_esw_table_zero_flow(dev))
                        priv->fdb_def_rule = 1;
                else
@@ -1359,7 +1460,7 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
        return 0;
 error:
        ret = rte_errno; /* Save rte_errno before cleanup. */
-       mlx5_flow_list_flush(dev, &priv->ctrl_flows, false);
+       mlx5_flow_list_flush(dev, MLX5_FLOW_TYPE_CTL, false);
        rte_errno = ret; /* Restore rte_errno. */
        return -rte_errno;
 }
@@ -1374,9 +1475,7 @@ error:
 void
 mlx5_traffic_disable(struct rte_eth_dev *dev)
 {
-       struct mlx5_priv *priv = dev->data->dev_private;
-
-       mlx5_flow_list_flush(dev, &priv->ctrl_flows, false);
+       mlx5_flow_list_flush(dev, MLX5_FLOW_TYPE_CTL, false);
 }
 
 /**