net/mlx5: improve stride parameter names

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

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c
index e64ef70..0e2eab0 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -148,7 +148,7 @@ static inline void
 mlx5_rx_mprq_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq)
 {
        const uint16_t wqe_n = 1 << rxq->elts_n;
-       const uint32_t strd_n = 1 << rxq->strd_num_n;
+       const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num);
        const uint32_t elts_n = wqe_n * strd_n;
        const uint32_t wqe_mask = elts_n - 1;
        uint32_t n = elts_n - (rxq->elts_ci - rxq->rq_pi);
@@ -157,7 +157,8 @@ mlx5_rx_mprq_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq)
        unsigned int i;
 
        if (n >= rxq->rq_repl_thresh &&
-           rxq->elts_ci - rxq->rq_pi <= rxq->rq_repl_thresh) {
+           rxq->elts_ci - rxq->rq_pi <=
+           rxq->rq_repl_thresh + MLX5_VPMD_RX_MAX_BURST) {
                MLX5_ASSERT(n >= MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n));
                MLX5_ASSERT(MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n) >
                             MLX5_VPMD_DESCS_PER_LOOP);
@@ -196,8 +197,8 @@ rxq_copy_mprq_mbuf_v(struct mlx5_rxq_data *rxq,
 {
        const uint16_t wqe_n = 1 << rxq->elts_n;
        const uint16_t wqe_mask = wqe_n - 1;
-       const uint16_t strd_sz = 1 << rxq->strd_sz_n;
-       const uint32_t strd_n = 1 << rxq->strd_num_n;
+       const uint16_t strd_sz = RTE_BIT32(rxq->log_strd_sz);
+       const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num);
        const uint32_t elts_n = wqe_n * strd_n;
        const uint32_t elts_mask = elts_n - 1;
        uint32_t elts_idx = rxq->rq_pi & elts_mask;
@@ -427,7 +428,7 @@ rxq_burst_mprq_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts,
        const uint16_t q_n = 1 << rxq->cqe_n;
        const uint16_t q_mask = q_n - 1;
        const uint16_t wqe_n = 1 << rxq->elts_n;
-       const uint32_t strd_n = 1 << rxq->strd_num_n;
+       const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num);
        const uint32_t elts_n = wqe_n * strd_n;
        const uint32_t elts_mask = elts_n - 1;
        volatile struct mlx5_cqe *cq;
@@ -447,6 +448,8 @@ rxq_burst_mprq_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts,
        rte_prefetch0(cq + 3);
        pkts_n = RTE_MIN(pkts_n, MLX5_VPMD_RX_MAX_BURST);
        mlx5_rx_mprq_replenish_bulk_mbuf(rxq);
+       /* Not to move past the allocated mbufs. */
+       pkts_n = RTE_MIN(pkts_n, rxq->elts_ci - rxq->rq_pi);
        /* See if there're unreturned mbufs from compressed CQE. */
        rcvd_pkt = rxq->decompressed;
        if (rcvd_pkt > 0) {
@@ -462,8 +465,6 @@ rxq_burst_mprq_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts,
        /* Not to cross queue end. */
        pkts_n = RTE_MIN(pkts_n, elts_n - elts_idx);
        pkts_n = RTE_MIN(pkts_n, q_n - cq_idx);
-       /* Not to move past the allocated mbufs. */
-       pkts_n = RTE_MIN(pkts_n, rxq->elts_ci - rxq->rq_pi);
        if (!pkts_n) {
                *no_cq = !cp_pkt;
                return cp_pkt;
@@ -549,7 +550,7 @@ mlx5_rxq_check_vec_support(struct mlx5_rxq_data *rxq)
        struct mlx5_rxq_ctrl *ctrl =
                container_of(rxq, struct mlx5_rxq_ctrl, rxq);
 
-       if (!ctrl->priv->config.rx_vec_en || rxq->sges_n != 0)
+       if (!RXQ_PORT(ctrl)->config.rx_vec_en || rxq->sges_n != 0)
                return -ENOTSUP;
        if (rxq->lro)
                return -ENOTSUP;
@@ -577,11 +578,11 @@ mlx5_check_vec_rx_support(struct rte_eth_dev *dev)
                return -ENOTSUP;
        /* All the configured queues should support. */
        for (i = 0; i < priv->rxqs_n; ++i) {
-               struct mlx5_rxq_data *rxq = (*priv->rxqs)[i];
+               struct mlx5_rxq_data *rxq_data = mlx5_rxq_data_get(dev, i);
 
-               if (!rxq)
+               if (!rxq_data)
                        continue;
-               if (mlx5_rxq_check_vec_support(rxq) < 0)
+               if (mlx5_rxq_check_vec_support(rxq_data) < 0)
                        break;
        }
        if (i != priv->rxqs_n)