d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix Rx queue recovery mechanism

Browse Source 
The local variables are getting inconsistent in data receiving routines
after queue error recovery.
Receive queue consumer index is getting wrong, need to reset one to the
size of the queue (as RQ was fully replenished in recovery procedure).

In MPRQ case, also the local consumed strd variable should be reset.

CVE-2022-28199
Fixes: 88c0733535 ("net/mlx5: extend Rx completion with error handling")
Cc: stable@dpdk.org

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Signed-off-by: Matan Azrad <matan@nvidia.com>
This commit is contained in:
Matan Azrad 2022-08-11 19:51:55 +03:00 committed by Thomas Monjalon
parent 7ccd05e7b7
commit 60b254e392
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/mlx5/mlx5_rx.c
View File

@ -408,6 +408,11 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq)
*rxq->rq_db = rte_cpu_to_be_32(rxq->rq_ci); *rxq->rq_db = rte_cpu_to_be_32(rxq->rq_ci);
} }
/* Must be negative. */
#define MLX5_ERROR_CQE_RET (-1)
/* Must not be negative. */
#define MLX5_RECOVERY_ERROR_RET 0
/** /**
* Handle a Rx error. * Handle a Rx error.
* The function inserts the RQ state to reset when the first error CQE is * The function inserts the RQ state to reset when the first error CQE is
@ -422,7 +427,7 @@ mlx5_rxq_initialize(struct mlx5_rxq_data *rxq)
* 0 when called from non-vectorized Rx burst. * 0 when called from non-vectorized Rx burst.
* *
* @return * @return
* -1 in case of recovery error, otherwise the CQE status. * MLX5_RECOVERY_ERROR_RET in case of recovery error, otherwise the CQE status.
*/ */
int int
mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec) mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
@ -451,7 +456,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
sm.queue_id = rxq->idx; sm.queue_id = rxq->idx;
sm.state = IBV_WQS_RESET; sm.state = IBV_WQS_RESET;
if (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm)) if (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm))
return -1; return MLX5_RECOVERY_ERROR_RET;
if (rxq_ctrl->dump_file_n < if (rxq_ctrl->dump_file_n <
RXQ_PORT(rxq_ctrl)->config.max_dump_files_num) { RXQ_PORT(rxq_ctrl)->config.max_dump_files_num) {
MKSTR(err_str, "Unexpected CQE error syndrome " MKSTR(err_str, "Unexpected CQE error syndrome "
@ -491,7 +496,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
sm.queue_id = rxq->idx; sm.queue_id = rxq->idx;
sm.state = IBV_WQS_RDY; sm.state = IBV_WQS_RDY;
if (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm)) if (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm))
return -1; return MLX5_RECOVERY_ERROR_RET;
if (vec) { if (vec) {
const uint32_t elts_n = const uint32_t elts_n =
mlx5_rxq_mprq_enabled(rxq) ? mlx5_rxq_mprq_enabled(rxq) ?
@ -519,7 +524,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
rte_pktmbuf_free_seg rte_pktmbuf_free_seg
(*elt); (*elt);
} }
return -1; return MLX5_RECOVERY_ERROR_RET;
} }
} }
for (i = 0; i < (int)elts_n; ++i) { for (i = 0; i < (int)elts_n; ++i) {
@ -538,7 +543,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
} }
return ret; return ret;
default: default:
return -1; return MLX5_RECOVERY_ERROR_RET;
} }
} }
@ -556,7 +561,9 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)
* written. * written.
* *
* @return * @return
* 0 in case of empty CQE, otherwise the packet size in bytes. * 0 in case of empty CQE, MLX5_ERROR_CQE_RET in case of error CQE,
* otherwise the packet size in regular RxQ, and striding byte
* count format in mprq case.
*/ */
static inline int static inline int
mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe, mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,
@ -623,8 +630,8 @@ mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,
rxq->err_state)) { rxq->err_state)) {
ret = mlx5_rx_err_handle(rxq, 0); ret = mlx5_rx_err_handle(rxq, 0);
if (ret == MLX5_CQE_STATUS_HW_OWN || if (ret == MLX5_CQE_STATUS_HW_OWN ||
ret == -1) ret == MLX5_RECOVERY_ERROR_RET)
return 0; return MLX5_ERROR_CQE_RET;
} else { } else {
return 0; return 0;
} }
@ -869,8 +876,10 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
if (!pkt) { if (!pkt) {
cqe = &(*rxq->cqes)[rxq->cq_ci & cqe_cnt]; cqe = &(*rxq->cqes)[rxq->cq_ci & cqe_cnt];
len = mlx5_rx_poll_len(rxq, cqe, cqe_cnt, &mcqe); len = mlx5_rx_poll_len(rxq, cqe, cqe_cnt, &mcqe);
if (!len) { if (len <= 0) {
rte_mbuf_raw_free(rep); rte_mbuf_raw_free(rep);
if (unlikely(len == MLX5_ERROR_CQE_RET))
rq_ci = rxq->rq_ci << sges_n;
break; break;
} }
pkt = seg; pkt = seg;
@ -1093,8 +1102,13 @@ mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
} }
cqe = &(*rxq->cqes)[rxq->cq_ci & cq_mask]; cqe = &(*rxq->cqes)[rxq->cq_ci & cq_mask];
ret = mlx5_rx_poll_len(rxq, cqe, cq_mask, &mcqe); ret = mlx5_rx_poll_len(rxq, cqe, cq_mask, &mcqe);
if (!ret) if (ret == 0)
break; break;
if (unlikely(ret == MLX5_ERROR_CQE_RET)) {
rq_ci = rxq->rq_ci;
consumed_strd = rxq->consumed_strd;
break;
}
byte_cnt = ret; byte_cnt = ret;
len = (byte_cnt & MLX5_MPRQ_LEN_MASK) >> MLX5_MPRQ_LEN_SHIFT; len = (byte_cnt & MLX5_MPRQ_LEN_MASK) >> MLX5_MPRQ_LEN_SHIFT;
MLX5_ASSERT((int)len >= (rxq->crc_present << 2)); MLX5_ASSERT((int)len >= (rxq->crc_present << 2));