Skip to content

Commit

Permalink
common/mlx5: fix error CQE handling for 128 bytes CQE
Browse files Browse the repository at this point in the history 
[ upstream commit 3cddeba0ca38b00c7dc646277484d08a4cb2d862 ]

The completion queue element size can be independently configured
to report either 64 or 128 bytes CQEs by programming cqe_sz parameter
at CQ creation. This parameter depends on the cache line size and
affects both regular CQEs and error CQEs. But the error handling
assumes that an error CQE is 64 bytes and doesn't take the padding
into consideration on platforms with 128-byte cache lines.
Fix the error CQE size in all error handling routines in mlx5.

Fixes: 957e45f ("net/mlx5: handle Tx completion with error")

Signed-off-by: Alexander Kozyrev <[email protected]>
Acked-by: Viacheslav Ovsiienko <[email protected]>
  • Loading branch information
@aleks-kozyrev @kevintraynor
aleks-kozyrev authored and kevintraynor committed Dec 3, 2024
1 parent 3ee516c commit a821cb0
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 24 deletions.
29 changes: 28 additions & 1 deletion drivers/common/mlx5/mlx5_prm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,12 @@
/* Maximum number of DS in WQE. Limited by 6-bit field. */
#define MLX5_DSEG_MAX 63

/* The 32 bit syndrome offset in struct mlx5_err_cqe. */
/* The 32 bit syndrome offset in struct mlx5_error_cqe. */
#if (RTE_CACHE_LINE_SIZE == 128)
#define MLX5_ERROR_CQE_SYNDROME_OFFSET 116
#else
#define MLX5_ERROR_CQE_SYNDROME_OFFSET 52
#endif

/* The completion mode offset in the WQE control segment line 2. */
#define MLX5_COMP_MODE_OFFSET 2
Expand Down Expand Up @@ -379,6 +383,29 @@ struct mlx5_wqe_mprq {

#define MLX5_MPRQ_STRIDE_SHIFT_BYTE 2

struct mlx5_error_cqe {
#if (RTE_CACHE_LINE_SIZE == 128)
uint8_t padding[64];
#endif
uint8_t rsvd0[2];
uint16_t eth_wqe_id;
uint8_t rsvd1[16];
uint16_t ib_stride_index;
uint8_t rsvd2[10];
uint32_t srqn;
uint8_t rsvd3[8];
uint32_t byte_cnt;
uint8_t rsvd4[4];
uint8_t hw_err_synd;
uint8_t hw_synd_type;
uint8_t vendor_err_synd;
uint8_t syndrome;
uint32_t s_wqe_opcode_qpn;
uint16_t wqe_counter;
uint8_t signature;
uint8_t op_own;
};

/* CQ element structure - should be equal to the cache line size */
struct mlx5_cqe {
#if (RTE_CACHE_LINE_SIZE == 128)
Expand Down
12 changes: 0 additions & 12 deletions drivers/common/mlx5/windows/mlx5_win_defs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,6 @@ struct mlx5_action {
} dest_tir;
};

struct mlx5_err_cqe {
uint8_t rsvd0[32];
uint32_t srqn;
uint8_t rsvd1[18];
uint8_t vendor_err_synd;
uint8_t syndrome;
uint32_t s_wqe_opcode_qpn;
uint16_t wqe_counter;
uint8_t signature;
uint8_t op_own;
};

struct mlx5_wqe_srq_next_seg {
uint8_t rsvd0[2];
rte_be16_t next_wqe_index;
Expand Down
4 changes: 2 additions & 2 deletions drivers/compress/mlx5/mlx5_compress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ mlx5_compress_dump_err_objs(volatile uint32_t *cqe, volatile uint32_t *wqe,
size_t i;

DRV_LOG(ERR, "Error cqe:");
for (i = 0; i < sizeof(struct mlx5_err_cqe) >> 2; i += 4)
for (i = 0; i < sizeof(struct mlx5_error_cqe) >> 2; i += 4)
DRV_LOG(ERR, "%08X %08X %08X %08X", cqe[i], cqe[i + 1],
cqe[i + 2], cqe[i + 3]);
DRV_LOG(ERR, "\nError wqe:");
Expand All @@ -555,7 +555,7 @@ mlx5_compress_cqe_err_handle(struct mlx5_compress_qp *qp,
struct rte_comp_op *op)
{
const uint32_t idx = qp->ci & (qp->entries_n - 1);
volatile struct mlx5_err_cqe *cqe = (volatile struct mlx5_err_cqe *)
volatile struct mlx5_error_cqe *cqe = (volatile struct mlx5_error_cqe *)
&qp->cq.cqes[idx];
volatile struct mlx5_gga_wqe *wqes = (volatile struct mlx5_gga_wqe *)
qp->qp.wqes;
Expand Down
2 changes: 1 addition & 1 deletion drivers/crypto/mlx5/mlx5_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static __rte_noinline void
mlx5_crypto_cqe_err_handle(struct mlx5_crypto_qp *qp, struct rte_crypto_op *op)
{
const uint32_t idx = qp->ci & (qp->entries_n - 1);
volatile struct mlx5_err_cqe *cqe = (volatile struct mlx5_err_cqe *)
volatile struct mlx5_error_cqe *cqe = (volatile struct mlx5_error_cqe *)
&qp->cq_obj.cqes[idx];

op->status = RTE_CRYPTO_OP_STATUS_ERROR;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/mlx5/mlx5_flow_aso.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ mlx5_aso_dump_err_objs(volatile uint32_t *cqe, volatile uint32_t *wqe)
int i;

DRV_LOG(ERR, "Error cqe:");
for (i = 0; i < 16; i += 4)
for (i = 0; i < (int)sizeof(struct mlx5_error_cqe) / 4; i += 4)
DRV_LOG(ERR, "%08X %08X %08X %08X", cqe[i], cqe[i + 1],
cqe[i + 2], cqe[i + 3]);
DRV_LOG(ERR, "\nError wqe:");
Expand All @@ -426,8 +426,8 @@ mlx5_aso_cqe_err_handle(struct mlx5_aso_sq *sq)
{
struct mlx5_aso_cq *cq = &sq->cq;
uint32_t idx = cq->cq_ci & ((1 << cq->log_desc_n) - 1);
volatile struct mlx5_err_cqe *cqe =
(volatile struct mlx5_err_cqe *)&cq->cq_obj.cqes[idx];
volatile struct mlx5_error_cqe *cqe =
(volatile struct mlx5_error_cqe *)&cq->cq_obj.cqes[idx];

cq->errors++;
idx = rte_be_to_cpu_16(cqe->wqe_counter) & (1u << sq->log_desc_n);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/mlx5/mlx5_rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec,
container_of(rxq, struct mlx5_rxq_ctrl, rxq);
union {
volatile struct mlx5_cqe *cqe;
volatile struct mlx5_err_cqe *err_cqe;
volatile struct mlx5_error_cqe *err_cqe;
} u = {
.cqe = &(*rxq->cqes)[(rxq->cq_ci - vec) & cqe_mask],
};
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/mlx5/mlx5_tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ tx_recover_qp(struct mlx5_txq_ctrl *txq_ctrl)

/* Return 1 if the error CQE is signed otherwise, sign it and return 0. */
static int
check_err_cqe_seen(volatile struct mlx5_err_cqe *err_cqe)
check_err_cqe_seen(volatile struct mlx5_error_cqe *err_cqe)
{
static const uint8_t magic[] = "seen";
int ret = 1;
Expand Down Expand Up @@ -83,7 +83,7 @@ check_err_cqe_seen(volatile struct mlx5_err_cqe *err_cqe)
*/
static int
mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
volatile struct mlx5_err_cqe *err_cqe)
volatile struct mlx5_error_cqe *err_cqe)
{
if (err_cqe->syndrome != MLX5_CQE_SYNDROME_WR_FLUSH_ERR) {
const uint16_t wqe_m = ((1 << txq->wqe_n) - 1);
Expand All @@ -107,7 +107,7 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
mlx5_dump_debug_information(name, "MLX5 Error CQ:",
(const void *)((uintptr_t)
txq->cqes),
sizeof(struct mlx5_cqe) *
sizeof(struct mlx5_error_cqe) *
(1 << txq->cqe_n));
mlx5_dump_debug_information(name, "MLX5 Error SQ:",
(const void *)((uintptr_t)
Expand Down Expand Up @@ -231,7 +231,7 @@ mlx5_tx_handle_completion(struct mlx5_txq_data *__rte_restrict txq,
*/
rte_wmb();
ret = mlx5_tx_error_cqe_handle
(txq, (volatile struct mlx5_err_cqe *)cqe);
(txq, (volatile struct mlx5_error_cqe *)cqe);
if (unlikely(ret < 0)) {
/*
* Some error occurred on queue error
Expand Down

0 comments on commit a821cb0

Please sign in to comment.