net/mlx5: mitigate Rx doorbell memory barrier

[dpdk.git] / drivers / net / mlx5 / mlx5_rxq.c

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 3330057..07adeb5 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -843,7 +843,7 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
        } attr;
        unsigned int cqe_n;
        unsigned int wqe_n = 1 << rxq_data->elts_n;
-       struct mlx5_rxq_ibv *tmpl;
+       struct mlx5_rxq_ibv *tmpl = NULL;
        struct mlx5dv_cq cq_info;
        struct mlx5dv_rwq rwq;
        unsigned int i;
@@ -1073,9 +1073,10 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
        rxq_data->cq_uar = cq_info.cq_uar;
        rxq_data->cqn = cq_info.cqn;
        rxq_data->cq_arm_sn = 0;
+       rxq_data->decompressed = 0;
        /* Update doorbell counter. */
        rxq_data->rq_ci = wqe_n >> rxq_data->sges_n;
-       rte_wmb();
+       rte_cio_wmb();
        *rxq_data->rq_db = rte_cpu_to_be_32(rxq_data->rq_ci);
        DRV_LOG(DEBUG, "port %u rxq %u updated with %p", dev->data->port_id,
                idx, (void *)&tmpl);
@@ -1084,15 +1085,19 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
        priv->verbs_alloc_ctx.type = MLX5_VERBS_ALLOC_TYPE_NONE;
        return tmpl;
 error:
-       ret = rte_errno; /* Save rte_errno before cleanup. */
-       if (tmpl->wq)
-               claim_zero(mlx5_glue->destroy_wq(tmpl->wq));
-       if (tmpl->cq)
-               claim_zero(mlx5_glue->destroy_cq(tmpl->cq));
-       if (tmpl->channel)
-               claim_zero(mlx5_glue->destroy_comp_channel(tmpl->channel));
+       if (tmpl) {
+               ret = rte_errno; /* Save rte_errno before cleanup. */
+               if (tmpl->wq)
+                       claim_zero(mlx5_glue->destroy_wq(tmpl->wq));
+               if (tmpl->cq)
+                       claim_zero(mlx5_glue->destroy_cq(tmpl->cq));
+               if (tmpl->channel)
+                       claim_zero(mlx5_glue->destroy_comp_channel
+                                                       (tmpl->channel));
+               rte_free(tmpl);
+               rte_errno = ret; /* Restore rte_errno. */
+       }
        priv->verbs_alloc_ctx.type = MLX5_VERBS_ALLOC_TYPE_NONE;
-       rte_errno = ret; /* Restore rte_errno. */
        return NULL;
 }