From 427ec3346d2902ae8f3c5ad5f39c10fe07a66ffb Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Mon, 13 Sep 2021 17:02:24 +0300 Subject: [PATCH] crypto/mlx5: fix queue indexing The crypto QP consumer (ci) and producer (pi) indexes are increased with each successful enqueue/dequeue operations. However the QP pi index is calculated with a wraparound the number of elements while the QP ci does not. This is causing incorrect engine calculation for encqueued WQ values (wq->pi - wq->ci) and eventually the device stops accepting new enqueue operations. Fixed by removing the wraparound on QP pi and using a temp calculation where wraparound values are needed. Fixes: 8e196c08ab53 ("crypto/mlx5: support enqueue/dequeue operations") Cc: stable@dpdk.org Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/crypto/mlx5/mlx5_crypto.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index e01be15ade..71c7e133ad 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -494,6 +494,7 @@ mlx5_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, struct rte_crypto_op *op; uint16_t mask = qp->entries_n - 1; uint16_t remain = qp->entries_n - (qp->pi - qp->ci); + uint32_t idx; if (remain < nb_ops) nb_ops = remain; @@ -502,8 +503,9 @@ mlx5_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, if (unlikely(remain == 0)) return 0; do { + idx = qp->pi & mask; op = *ops++; - umr = RTE_PTR_ADD(qp->umem_buf, priv->wqe_set_size * qp->pi); + umr = RTE_PTR_ADD(qp->umem_buf, priv->wqe_set_size * idx); if (unlikely(mlx5_crypto_wqe_set(priv, qp, op, umr) == 0)) { qp->stats.enqueue_err_count++; if (remain != nb_ops) { @@ -512,8 +514,8 @@ mlx5_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops, } return 0; } - qp->ops[qp->pi] = op; - qp->pi = (qp->pi + 1) & mask; + qp->ops[idx] = op; + qp->pi++; } while (--remain); qp->stats.enqueued_count += nb_ops; rte_io_wmb(); -- 2.20.1