net/mlx5: add macros for file name and path

[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 68c51dc..028e0f6 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -145,22 +145,29 @@ mlx5_rx_mprq_replenish_bulk_mbuf(struct mlx5_rxq_data *rxq)
        const uint32_t strd_n = 1 << rxq->strd_num_n;
        const uint32_t elts_n = wqe_n * strd_n;
        const uint32_t wqe_mask = elts_n - 1;
-       uint32_t n = rxq->elts_ci - rxq->rq_pi;
+       uint32_t n = elts_n - (rxq->elts_ci - rxq->rq_pi);
        uint32_t elts_idx = rxq->elts_ci & wqe_mask;
        struct rte_mbuf **elts = &(*rxq->elts)[elts_idx];
+       unsigned int i;
 
-       if (n <= rxq->rq_repl_thresh) {
-               MLX5_ASSERT(n + MLX5_VPMD_RX_MAX_BURST >=
-                           MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n));
+       if (n >= rxq->rq_repl_thresh &&
+           rxq->elts_ci - rxq->rq_pi <= rxq->rq_repl_thresh) {
+               MLX5_ASSERT(n >= MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n));
                MLX5_ASSERT(MLX5_VPMD_RXQ_RPLNSH_THRESH(elts_n) >
                             MLX5_VPMD_DESCS_PER_LOOP);
                /* Not to cross queue end. */
-               n = RTE_MIN(n + MLX5_VPMD_RX_MAX_BURST, elts_n - elts_idx);
+               n = RTE_MIN(n - MLX5_VPMD_DESCS_PER_LOOP, elts_n - elts_idx);
+               /* Limit replenish number to threshold value. */
+               n = RTE_MIN(n, rxq->rq_repl_thresh);
                if (rte_mempool_get_bulk(rxq->mp, (void *)elts, n) < 0) {
                        rxq->stats.rx_nombuf += n;
                        return;
                }
                rxq->elts_ci += n;
+               /* Prevent overflowing into consumed mbufs. */
+               elts_idx = rxq->elts_ci & wqe_mask;
+               for (i = 0; i < MLX5_VPMD_DESCS_PER_LOOP; ++i)
+                       (*rxq->elts)[elts_idx + i] = &rxq->fake_mbuf;
        }
 }