net/mlx5: separate DPDK from verbs Tx queue objects
[dpdk.git] / drivers / net / mlx5 / mlx5_txq.c
index a53b128..3a6ef39 100644 (file)
 #include <errno.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
+#include <sys/mman.h>
 
 /* Verbs header. */
 /* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
 #ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
+#pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <infiniband/verbs.h>
 #ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
+#pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
-#endif
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ethdev.h>
 #include <rte_common.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
-#endif
 
 #include "mlx5_utils.h"
+#include "mlx5_defs.h"
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_autoconf.h"
-#include "mlx5_defs.h"
 
 /**
  * Allocate TX queue elements.
  *
- * @param txq
+ * @param txq_ctrl
  *   Pointer to TX queue structure.
  * @param elts_n
  *   Number of elements to allocate.
- *
- * @return
- *   0 on success, errno value on failure.
  */
-static int
-txq_alloc_elts(struct txq *txq, unsigned int elts_n)
+static void
+txq_alloc_elts(struct mlx5_txq_ctrl *txq_ctrl, unsigned int elts_n)
 {
        unsigned int i;
-       struct txq_elt (*elts)[elts_n] =
-               rte_calloc_socket("TXQ", 1, sizeof(*elts), 0, txq->socket);
-       linear_t (*elts_linear)[elts_n] =
-               rte_calloc_socket("TXQ", 1, sizeof(*elts_linear), 0,
-                                 txq->socket);
-       struct ibv_mr *mr_linear = NULL;
-       int ret = 0;
 
-       if ((elts == NULL) || (elts_linear == NULL)) {
-               ERROR("%p: can't allocate packets array", (void *)txq);
-               ret = ENOMEM;
-               goto error;
-       }
-       mr_linear =
-               ibv_reg_mr(txq->priv->pd, elts_linear, sizeof(*elts_linear),
-                          (IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE));
-       if (mr_linear == NULL) {
-               ERROR("%p: unable to configure MR, ibv_reg_mr() failed",
-                     (void *)txq);
-               ret = EINVAL;
-               goto error;
-       }
-       for (i = 0; (i != elts_n); ++i) {
-               struct txq_elt *elt = &(*elts)[i];
-
-               elt->buf = NULL;
-       }
-       DEBUG("%p: allocated and configured %u WRs", (void *)txq, elts_n);
-       txq->elts_n = elts_n;
-       txq->elts = elts;
-       txq->elts_head = 0;
-       txq->elts_tail = 0;
-       txq->elts_comp = 0;
-       /* Request send completion every MLX5_PMD_TX_PER_COMP_REQ packets or
-        * at least 4 times per ring. */
-       txq->elts_comp_cd_init =
-               ((MLX5_PMD_TX_PER_COMP_REQ < (elts_n / 4)) ?
-                MLX5_PMD_TX_PER_COMP_REQ : (elts_n / 4));
-       txq->elts_comp_cd = txq->elts_comp_cd_init;
-       txq->elts_linear = elts_linear;
-       txq->mr_linear = mr_linear;
-       assert(ret == 0);
-       return 0;
-error:
-       if (mr_linear != NULL)
-               claim_zero(ibv_dereg_mr(mr_linear));
-
-       rte_free(elts_linear);
-       rte_free(elts);
-
-       DEBUG("%p: failed, freed everything", (void *)txq);
-       assert(ret > 0);
-       return ret;
+       for (i = 0; (i != elts_n); ++i)
+               (*txq_ctrl->txq.elts)[i] = NULL;
+       DEBUG("%p: allocated and configured %u WRs", (void *)txq_ctrl, elts_n);
+       txq_ctrl->txq.elts_head = 0;
+       txq_ctrl->txq.elts_tail = 0;
+       txq_ctrl->txq.elts_comp = 0;
 }
 
 /**
  * Free TX queue elements.
  *
- * @param txq
+ * @param txq_ctrl
  *   Pointer to TX queue structure.
  */
 static void
-txq_free_elts(struct txq *txq)
+txq_free_elts(struct mlx5_txq_ctrl *txq_ctrl)
 {
-       unsigned int i;
-       unsigned int elts_n = txq->elts_n;
-       struct txq_elt (*elts)[elts_n] = txq->elts;
-       linear_t (*elts_linear)[elts_n] = txq->elts_linear;
-       struct ibv_mr *mr_linear = txq->mr_linear;
-
-       DEBUG("%p: freeing WRs", (void *)txq);
-       txq->elts_n = 0;
-       txq->elts = NULL;
-       txq->elts_linear = NULL;
-       txq->mr_linear = NULL;
-       if (mr_linear != NULL)
-               claim_zero(ibv_dereg_mr(mr_linear));
-
-       rte_free(elts_linear);
-       if (elts == NULL)
-               return;
-       for (i = 0; (i != RTE_DIM(*elts)); ++i) {
-               struct txq_elt *elt = &(*elts)[i];
+       const uint16_t elts_n = 1 << txq_ctrl->txq.elts_n;
+       const uint16_t elts_m = elts_n - 1;
+       uint16_t elts_head = txq_ctrl->txq.elts_head;
+       uint16_t elts_tail = txq_ctrl->txq.elts_tail;
+       struct rte_mbuf *(*elts)[elts_n] = txq_ctrl->txq.elts;
 
-               if (elt->buf == NULL)
-                       continue;
-               rte_pktmbuf_free(elt->buf);
+       DEBUG("%p: freeing WRs", (void *)txq_ctrl);
+       txq_ctrl->txq.elts_head = 0;
+       txq_ctrl->txq.elts_tail = 0;
+       txq_ctrl->txq.elts_comp = 0;
+
+       while (elts_tail != elts_head) {
+               struct rte_mbuf *elt = (*elts)[elts_tail & elts_m];
+
+               assert(elt != NULL);
+               rte_pktmbuf_free_seg(elt);
+#ifndef NDEBUG
+               /* Poisoning. */
+               memset(&(*elts)[elts_tail & elts_m],
+                      0x77,
+                      sizeof((*elts)[elts_tail & elts_m]));
+#endif
+               ++elts_tail;
        }
-       rte_free(elts);
 }
 
 /**
@@ -176,61 +121,22 @@ txq_free_elts(struct txq *txq)
  *
  * Destroy objects, free allocated memory and reset the structure for reuse.
  *
- * @param txq
+ * @param txq_ctrl
  *   Pointer to TX queue structure.
  */
 void
-txq_cleanup(struct txq *txq)
+mlx5_txq_cleanup(struct mlx5_txq_ctrl *txq_ctrl)
 {
-       struct ibv_exp_release_intf_params params;
        size_t i;
 
-       DEBUG("cleaning up %p", (void *)txq);
-       txq_free_elts(txq);
-       if (txq->if_qp != NULL) {
-               assert(txq->priv != NULL);
-               assert(txq->priv->ctx != NULL);
-               assert(txq->qp != NULL);
-               params = (struct ibv_exp_release_intf_params){
-                       .comp_mask = 0,
-               };
-               claim_zero(ibv_exp_release_intf(txq->priv->ctx,
-                                               txq->if_qp,
-                                               &params));
-       }
-       if (txq->if_cq != NULL) {
-               assert(txq->priv != NULL);
-               assert(txq->priv->ctx != NULL);
-               assert(txq->cq != NULL);
-               params = (struct ibv_exp_release_intf_params){
-                       .comp_mask = 0,
-               };
-               claim_zero(ibv_exp_release_intf(txq->priv->ctx,
-                                               txq->if_cq,
-                                               &params));
-       }
-       if (txq->qp != NULL)
-               claim_zero(ibv_destroy_qp(txq->qp));
-       if (txq->cq != NULL)
-               claim_zero(ibv_destroy_cq(txq->cq));
-       if (txq->rd != NULL) {
-               struct ibv_exp_destroy_res_domain_attr attr = {
-                       .comp_mask = 0,
-               };
-
-               assert(txq->priv != NULL);
-               assert(txq->priv->ctx != NULL);
-               claim_zero(ibv_exp_destroy_res_domain(txq->priv->ctx,
-                                                     txq->rd,
-                                                     &attr));
-       }
-       for (i = 0; (i != RTE_DIM(txq->mp2mr)); ++i) {
-               if (txq->mp2mr[i].mp == NULL)
-                       break;
-               assert(txq->mp2mr[i].mr != NULL);
-               claim_zero(ibv_dereg_mr(txq->mp2mr[i].mr));
-       }
-       memset(txq, 0, sizeof(*txq));
+       DEBUG("cleaning up %p", (void *)txq_ctrl);
+       txq_free_elts(txq_ctrl);
+       for (i = 0; (i != RTE_DIM(txq_ctrl->txq.mp2mr)); ++i)
+               if (txq_ctrl->txq.mp2mr[i])
+                       priv_mr_release(txq_ctrl->priv, txq_ctrl->txq.mp2mr[i]);
+       if (txq_ctrl->ibv)
+               mlx5_priv_txq_ibv_release(txq_ctrl->priv, txq_ctrl->ibv);
+       memset(txq_ctrl, 0, sizeof(*txq_ctrl));
 }
 
 /**
@@ -238,7 +144,7 @@ txq_cleanup(struct txq *txq)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
- * @param txq
+ * @param txq_ctrl
  *   Pointer to TX queue structure.
  * @param desc
  *   Number of descriptors to configure in queue.
@@ -250,170 +156,110 @@ txq_cleanup(struct txq *txq)
  * @return
  *   0 on success, errno value on failure.
  */
-static int
-txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc,
-         unsigned int socket, const struct rte_eth_txconf *conf)
+int
+mlx5_txq_ctrl_setup(struct rte_eth_dev *dev, struct mlx5_txq_ctrl *txq_ctrl,
+                   uint16_t desc, unsigned int socket,
+                   const struct rte_eth_txconf *conf)
 {
-       struct priv *priv = dev->data->dev_private;
-       struct txq tmpl = {
+       struct priv *priv = mlx5_get_priv(dev);
+       struct mlx5_txq_ctrl tmpl = {
                .priv = priv,
-               .socket = socket
+               .socket = socket,
        };
-       union {
-               struct ibv_exp_query_intf_params params;
-               struct ibv_exp_qp_init_attr init;
-               struct ibv_exp_res_domain_init_attr rd;
-               struct ibv_exp_cq_init_attr cq;
-               struct ibv_exp_qp_attr mod;
-       } attr;
-       enum ibv_exp_query_intf_status status;
-       int ret = 0;
+       const unsigned int max_tso_inline = ((MLX5_MAX_TSO_HEADER +
+                                            (RTE_CACHE_LINE_SIZE - 1)) /
+                                             RTE_CACHE_LINE_SIZE);
 
-       (void)conf; /* Thresholds configuration (ignored). */
-       if ((desc == 0) || (desc % MLX5_PMD_SGE_WR_N)) {
-               ERROR("%p: invalid number of TX descriptors (must be a"
-                     " multiple of %d)", (void *)dev, MLX5_PMD_SGE_WR_N);
-               return EINVAL;
+       if (mlx5_getenv_int("MLX5_ENABLE_CQE_COMPRESSION")) {
+               ERROR("MLX5_ENABLE_CQE_COMPRESSION must never be set");
+               return ENOTSUP;
        }
-       desc /= MLX5_PMD_SGE_WR_N;
+       tmpl.txq.flags = conf->txq_flags;
+       assert(desc > MLX5_TX_COMP_THRESH);
+       tmpl.txq.elts_n = log2above(desc);
+       if (priv->mps == MLX5_MPW_ENHANCED)
+               tmpl.txq.mpw_hdr_dseg = priv->mpw_hdr_dseg;
        /* MRs will be registered in mp2mr[] later. */
-       attr.rd = (struct ibv_exp_res_domain_init_attr){
-               .comp_mask = (IBV_EXP_RES_DOMAIN_THREAD_MODEL |
-                             IBV_EXP_RES_DOMAIN_MSG_MODEL),
-               .thread_model = IBV_EXP_THREAD_SINGLE,
-               .msg_model = IBV_EXP_MSG_HIGH_BW,
-       };
-       tmpl.rd = ibv_exp_create_res_domain(priv->ctx, &attr.rd);
-       if (tmpl.rd == NULL) {
-               ret = ENOMEM;
-               ERROR("%p: RD creation failure: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-       attr.cq = (struct ibv_exp_cq_init_attr){
-               .comp_mask = IBV_EXP_CQ_INIT_ATTR_RES_DOMAIN,
-               .res_domain = tmpl.rd,
-       };
-       tmpl.cq = ibv_exp_create_cq(priv->ctx, desc, NULL, NULL, 0, &attr.cq);
-       if (tmpl.cq == NULL) {
-               ret = ENOMEM;
-               ERROR("%p: CQ creation failure: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
        DEBUG("priv->device_attr.max_qp_wr is %d",
-             priv->device_attr.max_qp_wr);
+             priv->device_attr.orig_attr.max_qp_wr);
        DEBUG("priv->device_attr.max_sge is %d",
-             priv->device_attr.max_sge);
-       attr.init = (struct ibv_exp_qp_init_attr){
-               /* CQ to be associated with the send queue. */
-               .send_cq = tmpl.cq,
-               /* CQ to be associated with the receive queue. */
-               .recv_cq = tmpl.cq,
-               .cap = {
-                       /* Max number of outstanding WRs. */
-                       .max_send_wr = ((priv->device_attr.max_qp_wr < desc) ?
-                                       priv->device_attr.max_qp_wr :
-                                       desc),
-                       /* Max number of scatter/gather elements in a WR. */
-                       .max_send_sge = ((priv->device_attr.max_sge <
-                                         MLX5_PMD_SGE_WR_N) ?
-                                        priv->device_attr.max_sge :
-                                        MLX5_PMD_SGE_WR_N),
-#if MLX5_PMD_MAX_INLINE > 0
-                       .max_inline_data = MLX5_PMD_MAX_INLINE,
-#endif
-               },
-               .qp_type = IBV_QPT_RAW_PACKET,
-               /* Do *NOT* enable this, completions events are managed per
-                * TX burst. */
-               .sq_sig_all = 0,
-               .pd = priv->pd,
-               .res_domain = tmpl.rd,
-               .comp_mask = (IBV_EXP_QP_INIT_ATTR_PD |
-                             IBV_EXP_QP_INIT_ATTR_RES_DOMAIN),
-       };
-       tmpl.qp = ibv_exp_create_qp(priv->ctx, &attr.init);
-       if (tmpl.qp == NULL) {
-               ret = (errno ? errno : EINVAL);
-               ERROR("%p: QP creation failure: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-#if MLX5_PMD_MAX_INLINE > 0
-       /* ibv_create_qp() updates this value. */
-       tmpl.max_inline = attr.init.cap.max_inline_data;
-#endif
-       attr.mod = (struct ibv_exp_qp_attr){
-               /* Move the QP to this state. */
-               .qp_state = IBV_QPS_INIT,
-               /* Primary port number. */
-               .port_num = priv->port
-       };
-       ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod,
-                               (IBV_EXP_QP_STATE | IBV_EXP_QP_PORT));
-       if (ret) {
-               ERROR("%p: QP state to IBV_QPS_INIT failed: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-       ret = txq_alloc_elts(&tmpl, desc);
-       if (ret) {
-               ERROR("%p: TXQ allocation failed: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-       attr.mod = (struct ibv_exp_qp_attr){
-               .qp_state = IBV_QPS_RTR
-       };
-       ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod, IBV_EXP_QP_STATE);
-       if (ret) {
-               ERROR("%p: QP state to IBV_QPS_RTR failed: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-       attr.mod.qp_state = IBV_QPS_RTS;
-       ret = ibv_exp_modify_qp(tmpl.qp, &attr.mod, IBV_EXP_QP_STATE);
-       if (ret) {
-               ERROR("%p: QP state to IBV_QPS_RTS failed: %s",
-                     (void *)dev, strerror(ret));
-               goto error;
-       }
-       attr.params = (struct ibv_exp_query_intf_params){
-               .intf_scope = IBV_EXP_INTF_GLOBAL,
-               .intf = IBV_EXP_INTF_CQ,
-               .obj = tmpl.cq,
-       };
-       tmpl.if_cq = ibv_exp_query_intf(priv->ctx, &attr.params, &status);
-       if (tmpl.if_cq == NULL) {
-               ret = EINVAL;
-               ERROR("%p: CQ interface family query failed with status %d",
-                     (void *)dev, status);
-               goto error;
+             priv->device_attr.orig_attr.max_sge);
+       if (priv->txq_inline && (priv->txqs_n >= priv->txqs_inline)) {
+               unsigned int ds_cnt;
+
+               tmpl.txq.max_inline =
+                       ((priv->txq_inline + (RTE_CACHE_LINE_SIZE - 1)) /
+                        RTE_CACHE_LINE_SIZE);
+               tmpl.txq.inline_en = 1;
+               /* TSO and MPS can't be enabled concurrently. */
+               assert(!priv->tso || !priv->mps);
+               if (priv->mps == MLX5_MPW_ENHANCED) {
+                       tmpl.txq.inline_max_packet_sz =
+                               priv->inline_max_packet_sz;
+                       /* To minimize the size of data set, avoid requesting
+                        * too large WQ.
+                        */
+                       tmpl.max_inline_data =
+                               ((RTE_MIN(priv->txq_inline,
+                                         priv->inline_max_packet_sz) +
+                                 (RTE_CACHE_LINE_SIZE - 1)) /
+                                RTE_CACHE_LINE_SIZE) * RTE_CACHE_LINE_SIZE;
+               } else if (priv->tso) {
+                       int inline_diff = tmpl.txq.max_inline - max_tso_inline;
+
+                       /*
+                        * Adjust inline value as Verbs aggregates
+                        * tso_inline and txq_inline fields.
+                        */
+                       tmpl.max_inline_data = inline_diff > 0 ?
+                                              inline_diff *
+                                              RTE_CACHE_LINE_SIZE :
+                                              0;
+               } else {
+                       tmpl.max_inline_data =
+                               tmpl.txq.max_inline * RTE_CACHE_LINE_SIZE;
+               }
+               /*
+                * Check if the inline size is too large in a way which
+                * can make the WQE DS to overflow.
+                * Considering in calculation:
+                *      WQE CTRL (1 DS)
+                *      WQE ETH  (1 DS)
+                *      Inline part (N DS)
+                */
+               ds_cnt = 2 + (tmpl.max_inline_data / MLX5_WQE_DWORD_SIZE);
+               if (ds_cnt > MLX5_DSEG_MAX) {
+                       unsigned int max_inline = (MLX5_DSEG_MAX - 2) *
+                                                  MLX5_WQE_DWORD_SIZE;
+
+                       max_inline = max_inline - (max_inline %
+                                                  RTE_CACHE_LINE_SIZE);
+                       WARN("txq inline is too large (%d) setting it to "
+                            "the maximum possible: %d\n",
+                            priv->txq_inline, max_inline);
+                       tmpl.txq.max_inline = max_inline / RTE_CACHE_LINE_SIZE;
+               }
        }
-       attr.params = (struct ibv_exp_query_intf_params){
-               .intf_scope = IBV_EXP_INTF_GLOBAL,
-               .intf = IBV_EXP_INTF_QP_BURST,
-               .obj = tmpl.qp,
-       };
-       tmpl.if_qp = ibv_exp_query_intf(priv->ctx, &attr.params, &status);
-       if (tmpl.if_qp == NULL) {
-               ret = EINVAL;
-               ERROR("%p: QP interface family query failed with status %d",
-                     (void *)dev, status);
-               goto error;
+       if (priv->tso) {
+               tmpl.max_tso_header = max_tso_inline * RTE_CACHE_LINE_SIZE;
+               tmpl.txq.max_inline = RTE_MAX(tmpl.txq.max_inline,
+                                             max_tso_inline);
+               tmpl.txq.tso_en = 1;
        }
+       if (priv->tunnel_en)
+               tmpl.txq.tunnel_en = 1;
+       tmpl.txq.elts =
+               (struct rte_mbuf *(*)[1 << tmpl.txq.elts_n])
+               ((uintptr_t)txq_ctrl + sizeof(*txq_ctrl));
+       txq_alloc_elts(&tmpl, desc);
        /* Clean up txq in case we're reinitializing it. */
-       DEBUG("%p: cleaning-up old txq just in case", (void *)txq);
-       txq_cleanup(txq);
-       *txq = tmpl;
-       DEBUG("%p: txq updated with %p", (void *)txq, (void *)&tmpl);
-       assert(ret == 0);
+       DEBUG("%p: cleaning-up old txq just in case", (void *)txq_ctrl);
+       mlx5_txq_cleanup(txq_ctrl);
+       *txq_ctrl = tmpl;
+       DEBUG("%p: txq updated with %p", (void *)txq_ctrl, (void *)&tmpl);
+       /* Pre-register known mempools. */
+       rte_mempool_walk(mlx5_txq_mp2mr_iter, txq_ctrl);
        return 0;
-error:
-       txq_cleanup(&tmpl);
-       assert(ret > 0);
-       return ret;
 }
 
 /**
@@ -438,10 +284,28 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
                    unsigned int socket, const struct rte_eth_txconf *conf)
 {
        struct priv *priv = dev->data->dev_private;
-       struct txq *txq = (*priv->txqs)[idx];
+       struct mlx5_txq_data *txq = (*priv->txqs)[idx];
+       struct mlx5_txq_ctrl *txq_ctrl =
+               container_of(txq, struct mlx5_txq_ctrl, txq);
        int ret;
 
+       if (mlx5_is_secondary())
+               return -E_RTE_SECONDARY;
+
        priv_lock(priv);
+       if (desc <= MLX5_TX_COMP_THRESH) {
+               WARN("%p: number of descriptors requested for TX queue %u"
+                    " must be higher than MLX5_TX_COMP_THRESH, using"
+                    " %u instead of %u",
+                    (void *)dev, idx, MLX5_TX_COMP_THRESH + 1, desc);
+               desc = MLX5_TX_COMP_THRESH + 1;
+       }
+       if (!rte_is_power_of_2(desc)) {
+               desc = 1 << log2above(desc);
+               WARN("%p: increased number of descriptors in TX queue %u"
+                    " to the next power of two (%d)",
+                    (void *)dev, idx, desc);
+       }
        DEBUG("%p: configuring queue %u for %u descriptors",
              (void *)dev, idx, desc);
        if (idx >= priv->txqs_n) {
@@ -453,32 +317,55 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
        if (txq != NULL) {
                DEBUG("%p: reusing already allocated queue index %u (%p)",
                      (void *)dev, idx, (void *)txq);
-               if (priv->started) {
+               if (dev->data->dev_started) {
                        priv_unlock(priv);
                        return -EEXIST;
                }
                (*priv->txqs)[idx] = NULL;
-               txq_cleanup(txq);
+               mlx5_txq_cleanup(txq_ctrl);
+               /* Resize if txq size is changed. */
+               if (txq_ctrl->txq.elts_n != log2above(desc)) {
+                       txq_ctrl = rte_realloc(txq_ctrl,
+                                              sizeof(*txq_ctrl) +
+                                              desc * sizeof(struct rte_mbuf *),
+                                              RTE_CACHE_LINE_SIZE);
+                       if (!txq_ctrl) {
+                               ERROR("%p: unable to reallocate queue index %u",
+                                       (void *)dev, idx);
+                               priv_unlock(priv);
+                               return -ENOMEM;
+                       }
+               }
        } else {
-               txq = rte_calloc_socket("TXQ", 1, sizeof(*txq), 0, socket);
-               if (txq == NULL) {
+               txq_ctrl =
+                       rte_calloc_socket("TXQ", 1,
+                                         sizeof(*txq_ctrl) +
+                                         desc * sizeof(struct rte_mbuf *),
+                                         0, socket);
+               if (txq_ctrl == NULL) {
                        ERROR("%p: unable to allocate queue index %u",
                              (void *)dev, idx);
                        priv_unlock(priv);
                        return -ENOMEM;
                }
        }
-       ret = txq_setup(dev, txq, desc, socket, conf);
-       if (ret)
-               rte_free(txq);
-       else {
-               txq->stats.idx = idx;
-               DEBUG("%p: adding TX queue %p to list",
-                     (void *)dev, (void *)txq);
-               (*priv->txqs)[idx] = txq;
-               /* Update send callback. */
-               dev->tx_pkt_burst = mlx5_tx_burst;
+       ret = mlx5_txq_ctrl_setup(dev, txq_ctrl, desc, socket, conf);
+       if (ret) {
+               rte_free(txq_ctrl);
+               goto out;
+       }
+       txq_ctrl->txq.stats.idx = idx;
+       DEBUG("%p: adding TX queue %p to list",
+             (void *)dev, (void *)txq_ctrl);
+       (*priv->txqs)[idx] = &txq_ctrl->txq;
+       txq_ctrl->ibv = mlx5_priv_txq_ibv_new(priv, idx);
+       if (!txq_ctrl->ibv) {
+               ret = EAGAIN;
+               goto out;
        }
+       /* Update send callback. */
+       priv_dev_select_tx_function(priv, priv->dev);
+out:
        priv_unlock(priv);
        return -ret;
 }
@@ -492,22 +379,343 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 void
 mlx5_tx_queue_release(void *dpdk_txq)
 {
-       struct txq *txq = (struct txq *)dpdk_txq;
+       struct mlx5_txq_data *txq = (struct mlx5_txq_data *)dpdk_txq;
+       struct mlx5_txq_ctrl *txq_ctrl;
        struct priv *priv;
        unsigned int i;
 
+       if (mlx5_is_secondary())
+               return;
+
        if (txq == NULL)
                return;
-       priv = txq->priv;
+       txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);
+       priv = txq_ctrl->priv;
        priv_lock(priv);
        for (i = 0; (i != priv->txqs_n); ++i)
                if ((*priv->txqs)[i] == txq) {
                        DEBUG("%p: removing TX queue %p from list",
-                             (void *)priv->dev, (void *)txq);
+                             (void *)priv->dev, (void *)txq_ctrl);
                        (*priv->txqs)[i] = NULL;
                        break;
                }
-       txq_cleanup(txq);
-       rte_free(txq);
+       mlx5_txq_cleanup(txq_ctrl);
+       rte_free(txq_ctrl);
        priv_unlock(priv);
 }
+
+
+/**
+ * Map locally UAR used in Tx queues for BlueFlame doorbell.
+ *
+ * @param[in] priv
+ *   Pointer to private structure.
+ * @param fd
+ *   Verbs file descriptor to map UAR pages.
+ *
+ * @return
+ *   0 on success, errno value on failure.
+ */
+int
+priv_tx_uar_remap(struct priv *priv, int fd)
+{
+       unsigned int i, j;
+       uintptr_t pages[priv->txqs_n];
+       unsigned int pages_n = 0;
+       uintptr_t uar_va;
+       void *addr;
+       struct mlx5_txq_data *txq;
+       struct mlx5_txq_ctrl *txq_ctrl;
+       int already_mapped;
+       size_t page_size = sysconf(_SC_PAGESIZE);
+
+       /*
+        * As rdma-core, UARs are mapped in size of OS page size.
+        * Use aligned address to avoid duplicate mmap.
+        * Ref to libmlx5 function: mlx5_init_context()
+        */
+       for (i = 0; i != priv->txqs_n; ++i) {
+               txq = (*priv->txqs)[i];
+               txq_ctrl = container_of(txq, struct mlx5_txq_ctrl, txq);
+               uar_va = (uintptr_t)txq_ctrl->txq.bf_reg;
+               uar_va = RTE_ALIGN_FLOOR(uar_va, page_size);
+               already_mapped = 0;
+               for (j = 0; j != pages_n; ++j) {
+                       if (pages[j] == uar_va) {
+                               already_mapped = 1;
+                               break;
+                       }
+               }
+               if (already_mapped)
+                       continue;
+               pages[pages_n++] = uar_va;
+               addr = mmap((void *)uar_va, page_size,
+                           PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
+                           txq_ctrl->uar_mmap_offset);
+               if (addr != (void *)uar_va) {
+                       ERROR("call to mmap failed on UAR for txq %d\n", i);
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+/**
+ * Create the Tx queue Verbs object.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param idx
+ *   Queue index in DPDK Rx queue array
+ *
+ * @return
+ *   The Verbs object initialised if it can be created.
+ */
+struct mlx5_txq_ibv*
+mlx5_priv_txq_ibv_new(struct priv *priv, uint16_t idx)
+{
+       struct mlx5_txq_data *txq_data = (*priv->txqs)[idx];
+       struct mlx5_txq_ctrl *txq_ctrl =
+               container_of(txq_data, struct mlx5_txq_ctrl, txq);
+       struct mlx5_txq_ibv tmpl;
+       struct mlx5_txq_ibv *txq_ibv;
+       union {
+               struct ibv_qp_init_attr_ex init;
+               struct ibv_cq_init_attr_ex cq;
+               struct ibv_qp_attr mod;
+               struct ibv_cq_ex cq_attr;
+       } attr;
+       unsigned int cqe_n;
+       struct mlx5dv_qp qp;
+       struct mlx5dv_cq cq_info;
+       struct mlx5dv_obj obj;
+       const int desc = 1 << txq_data->elts_n;
+       int ret = 0;
+
+       assert(txq_data);
+       if (mlx5_getenv_int("MLX5_ENABLE_CQE_COMPRESSION")) {
+               ERROR("MLX5_ENABLE_CQE_COMPRESSION must never be set");
+               goto error;
+       }
+       memset(&tmpl, 0, sizeof(struct mlx5_txq_ibv));
+       /* MRs will be registered in mp2mr[] later. */
+       attr.cq = (struct ibv_cq_init_attr_ex){
+               .comp_mask = 0,
+       };
+       cqe_n = ((desc / MLX5_TX_COMP_THRESH) - 1) ?
+               ((desc / MLX5_TX_COMP_THRESH) - 1) : 1;
+       if (priv->mps == MLX5_MPW_ENHANCED)
+               cqe_n += MLX5_TX_COMP_THRESH_INLINE_DIV;
+       tmpl.cq = ibv_create_cq(priv->ctx, cqe_n, NULL, NULL, 0);
+       if (tmpl.cq == NULL) {
+               ERROR("%p: CQ creation failure", (void *)txq_ctrl);
+               goto error;
+       }
+       attr.init = (struct ibv_qp_init_attr_ex){
+               /* CQ to be associated with the send queue. */
+               .send_cq = tmpl.cq,
+               /* CQ to be associated with the receive queue. */
+               .recv_cq = tmpl.cq,
+               .cap = {
+                       /* Max number of outstanding WRs. */
+                       .max_send_wr =
+                               ((priv->device_attr.orig_attr.max_qp_wr <
+                                 desc) ?
+                                priv->device_attr.orig_attr.max_qp_wr :
+                                desc),
+                       /*
+                        * Max number of scatter/gather elements in a WR,
+                        * must be 1 to prevent libmlx5 from trying to affect
+                        * too much memory. TX gather is not impacted by the
+                        * priv->device_attr.max_sge limit and will still work
+                        * properly.
+                        */
+                       .max_send_sge = 1,
+               },
+               .qp_type = IBV_QPT_RAW_PACKET,
+               /*
+                * Do *NOT* enable this, completions events are managed per
+                * Tx burst.
+                */
+               .sq_sig_all = 0,
+               .pd = priv->pd,
+               .comp_mask = IBV_QP_INIT_ATTR_PD,
+       };
+       if (txq_data->inline_en)
+               attr.init.cap.max_inline_data = txq_ctrl->max_inline_data;
+       if (txq_data->tso_en) {
+               attr.init.max_tso_header = txq_ctrl->max_tso_header;
+               attr.init.comp_mask |= IBV_QP_INIT_ATTR_MAX_TSO_HEADER;
+       }
+       tmpl.qp = ibv_create_qp_ex(priv->ctx, &attr.init);
+       if (tmpl.qp == NULL) {
+               ERROR("%p: QP creation failure", (void *)txq_ctrl);
+               goto error;
+       }
+       attr.mod = (struct ibv_qp_attr){
+               /* Move the QP to this state. */
+               .qp_state = IBV_QPS_INIT,
+               /* Primary port number. */
+               .port_num = priv->port
+       };
+       ret = ibv_modify_qp(tmpl.qp, &attr.mod, (IBV_QP_STATE | IBV_QP_PORT));
+       if (ret) {
+               ERROR("%p: QP state to IBV_QPS_INIT failed", (void *)txq_ctrl);
+               goto error;
+       }
+       attr.mod = (struct ibv_qp_attr){
+               .qp_state = IBV_QPS_RTR
+       };
+       ret = ibv_modify_qp(tmpl.qp, &attr.mod, IBV_QP_STATE);
+       if (ret) {
+               ERROR("%p: QP state to IBV_QPS_RTR failed", (void *)txq_ctrl);
+               goto error;
+       }
+       attr.mod.qp_state = IBV_QPS_RTS;
+       ret = ibv_modify_qp(tmpl.qp, &attr.mod, IBV_QP_STATE);
+       if (ret) {
+               ERROR("%p: QP state to IBV_QPS_RTS failed", (void *)txq_ctrl);
+               goto error;
+       }
+       txq_ibv = rte_calloc_socket(__func__, 1, sizeof(struct mlx5_txq_ibv), 0,
+                                   txq_ctrl->socket);
+       if (!txq_ibv) {
+               ERROR("%p: cannot allocate memory", (void *)txq_ctrl);
+               goto error;
+       }
+       obj.cq.in = tmpl.cq;
+       obj.cq.out = &cq_info;
+       obj.qp.in = tmpl.qp;
+       obj.qp.out = &qp;
+       ret = mlx5dv_init_obj(&obj, MLX5DV_OBJ_CQ | MLX5DV_OBJ_QP);
+       if (ret != 0)
+               goto error;
+       if (cq_info.cqe_size != RTE_CACHE_LINE_SIZE) {
+               ERROR("Wrong MLX5_CQE_SIZE environment variable value: "
+                     "it should be set to %u", RTE_CACHE_LINE_SIZE);
+               goto error;
+       }
+       txq_data->cqe_n = log2above(cq_info.cqe_cnt);
+       txq_data->qp_num_8s = tmpl.qp->qp_num << 8;
+       txq_data->wqes = qp.sq.buf;
+       txq_data->wqe_n = log2above(qp.sq.wqe_cnt);
+       txq_data->qp_db = &qp.dbrec[MLX5_SND_DBR];
+       txq_data->bf_reg = qp.bf.reg;
+       txq_data->cq_db = cq_info.dbrec;
+       txq_data->cqes =
+               (volatile struct mlx5_cqe (*)[])
+               (uintptr_t)cq_info.buf;
+       txq_data->cq_ci = 0;
+       txq_data->cq_pi = 0;
+       txq_data->wqe_ci = 0;
+       txq_data->wqe_pi = 0;
+       txq_ibv->qp = tmpl.qp;
+       txq_ibv->cq = tmpl.cq;
+       rte_atomic32_inc(&txq_ibv->refcnt);
+       DEBUG("%p: Verbs Tx queue %p: refcnt %d", (void *)priv,
+             (void *)txq_ibv, rte_atomic32_read(&txq_ibv->refcnt));
+       LIST_INSERT_HEAD(&priv->txqsibv, txq_ibv, next);
+       return txq_ibv;
+error:
+       if (tmpl.cq)
+               claim_zero(ibv_destroy_cq(tmpl.cq));
+       if (tmpl.qp)
+               claim_zero(ibv_destroy_qp(tmpl.qp));
+       return NULL;
+}
+
+/**
+ * Get an Tx queue Verbs object.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param idx
+ *   Queue index in DPDK Rx queue array
+ *
+ * @return
+ *   The Verbs object if it exists.
+ */
+struct mlx5_txq_ibv*
+mlx5_priv_txq_ibv_get(struct priv *priv, uint16_t idx)
+{
+       struct mlx5_txq_ctrl *txq_ctrl;
+
+       if (idx >= priv->txqs_n)
+               return NULL;
+       if (!(*priv->txqs)[idx])
+               return NULL;
+       txq_ctrl = container_of((*priv->txqs)[idx], struct mlx5_txq_ctrl, txq);
+       if (txq_ctrl->ibv) {
+               rte_atomic32_inc(&txq_ctrl->ibv->refcnt);
+               DEBUG("%p: Verbs Tx queue %p: refcnt %d", (void *)priv,
+                     (void *)txq_ctrl->ibv,
+                     rte_atomic32_read(&txq_ctrl->ibv->refcnt));
+       }
+       return txq_ctrl->ibv;
+}
+
+/**
+ * Release an Tx verbs queue object.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param txq_ibv
+ *   Verbs Tx queue object.
+ *
+ * @return
+ *   0 on success, errno on failure.
+ */
+int
+mlx5_priv_txq_ibv_release(struct priv *priv, struct mlx5_txq_ibv *txq_ibv)
+{
+       (void)priv;
+       assert(txq_ibv);
+       DEBUG("%p: Verbs Tx queue %p: refcnt %d", (void *)priv,
+             (void *)txq_ibv, rte_atomic32_read(&txq_ibv->refcnt));
+       if (rte_atomic32_dec_and_test(&txq_ibv->refcnt)) {
+               claim_zero(ibv_destroy_qp(txq_ibv->qp));
+               claim_zero(ibv_destroy_cq(txq_ibv->cq));
+               LIST_REMOVE(txq_ibv, next);
+               rte_free(txq_ibv);
+               return 0;
+       }
+       return EBUSY;
+}
+
+/**
+ * Return true if a single reference exists on the object.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param txq_ibv
+ *   Verbs Tx queue object.
+ */
+int
+mlx5_priv_txq_ibv_releasable(struct priv *priv, struct mlx5_txq_ibv *txq_ibv)
+{
+       (void)priv;
+       assert(txq_ibv);
+       return (rte_atomic32_read(&txq_ibv->refcnt) == 1);
+}
+
+/**
+ * Verify the Verbs Tx queue list is empty
+ *
+ * @param priv
+ *  Pointer to private structure.
+ *
+ * @return the number of object not released.
+ */
+int
+mlx5_priv_txq_ibv_verify(struct priv *priv)
+{
+       int ret = 0;
+       struct mlx5_txq_ibv *txq_ibv;
+
+       LIST_FOREACH(txq_ibv, &priv->txqsibv, next) {
+               DEBUG("%p: Verbs Tx queue %p still referenced", (void *)priv,
+                     (void *)txq_ibv);
+               ++ret;
+       }
+       return ret;
+}