Skip to content

Commit 2ba0aa2

Browse files
alaahljgunthorpe
authored andcommitted
IB/mlx5: Fix initializing CQ fragments buffer
The function init_cq_frag_buf() can be called to initialize the current CQ fragments buffer cq->buf, or the temporary cq->resize_buf that is filled during CQ resize operation. However, the offending commit started to use function get_cqe() for getting the CQEs, the issue with this change is that get_cqe() always returns CQEs from cq->buf, which leads us to initialize the wrong buffer, and in case of enlarging the CQ we try to access elements beyond the size of the current cq->buf and eventually hit a kernel panic. [exception RIP: init_cq_frag_buf+103] [ffff9f799ddcbcd8] mlx5_ib_resize_cq at ffffffffc0835d60 [mlx5_ib] [ffff9f799ddcbdb0] ib_resize_cq at ffffffffc05270df [ib_core] [ffff9f799ddcbdc0] llt_rdma_setup_qp at ffffffffc0a6a712 [llt] [ffff9f799ddcbe10] llt_rdma_cc_event_action at ffffffffc0a6b411 [llt] [ffff9f799ddcbe98] llt_rdma_client_conn_thread at ffffffffc0a6bb75 [llt] [ffff9f799ddcbec8] kthread at ffffffffa66c5da1 [ffff9f799ddcbf50] ret_from_fork_nospec_begin at ffffffffa6d95ddd Fix it by getting the needed CQE by calling mlx5_frag_buf_get_wqe() that takes the correct source buffer as a parameter. Fixes: 388ca8b ("IB/mlx5: Implement fragmented completion queue (CQ)") Link: https://lore.kernel.org/r/90a0e8c924093cfa50a482880ad7e7edb73dc19a.1623309971.git.leonro@nvidia.com Signed-off-by: Alaa Hleihel <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 6466f03 commit 2ba0aa2

File tree

1 file changed

+4
-5
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+4
-5
lines changed

drivers/infiniband/hw/mlx5/cq.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -849,15 +849,14 @@ static void destroy_cq_user(struct mlx5_ib_cq *cq, struct ib_udata *udata)
849849
ib_umem_release(cq->buf.umem);
850850
}
851851

852-
static void init_cq_frag_buf(struct mlx5_ib_cq *cq,
853-
struct mlx5_ib_cq_buf *buf)
852+
static void init_cq_frag_buf(struct mlx5_ib_cq_buf *buf)
854853
{
855854
int i;
856855
void *cqe;
857856
struct mlx5_cqe64 *cqe64;
858857

859858
for (i = 0; i < buf->nent; i++) {
860-
cqe = get_cqe(cq, i);
859+
cqe = mlx5_frag_buf_get_wqe(&buf->fbc, i);
861860
cqe64 = buf->cqe_size == 64 ? cqe : cqe + 64;
862861
cqe64->op_own = MLX5_CQE_INVALID << 4;
863862
}
@@ -883,7 +882,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
883882
if (err)
884883
goto err_db;
885884

886-
init_cq_frag_buf(cq, &cq->buf);
885+
init_cq_frag_buf(&cq->buf);
887886

888887
*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +
889888
MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) *
@@ -1184,7 +1183,7 @@ static int resize_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
11841183
if (err)
11851184
goto ex;
11861185

1187-
init_cq_frag_buf(cq, cq->resize_buf);
1186+
init_cq_frag_buf(cq->resize_buf);
11881187

11891188
return 0;
11901189

0 commit comments

Comments
 (0)