Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7798dbf4 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize 



When resizing a CQ, when copying over unpolled CQEs from the old CQE
buffer to the new buffer, the ownership bit must be set appropriately
for the new buffer, or the ownership bit in the new buffer gets
corrupted.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent f5eda57f

drivers/infiniband/hw/mlx4/cq.c

+6 −4
Original line number Diff line number Diff line
@@ -325,15 +325,17 @@ static int mlx4_ib_get_outstanding_cqes(struct mlx4_ib_cq *cq) 


static void mlx4_ib_cq_resize_copy_cqes(struct mlx4_ib_cq *cq)

{

	struct mlx4_cqe *cqe;

	struct mlx4_cqe *cqe, *new_cqe;

	int i;



	i = cq->mcq.cons_index;

	cqe = get_cqe(cq, i & cq->ibcq.cqe);

	while ((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) != MLX4_CQE_OPCODE_RESIZE) {

		memcpy(get_cqe_from_buf(&cq->resize_buf->buf,

					(i + 1) & cq->resize_buf->cqe),

			get_cqe(cq, i & cq->ibcq.cqe), sizeof(struct mlx4_cqe));

		new_cqe = get_cqe_from_buf(&cq->resize_buf->buf,

					   (i + 1) & cq->resize_buf->cqe);

		memcpy(new_cqe, get_cqe(cq, i & cq->ibcq.cqe), sizeof(struct mlx4_cqe));

		new_cqe->owner_sr_opcode = (cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK) |

			(((i + 1) & (cq->resize_buf->cqe + 1)) ? MLX4_CQE_OWNER_MASK : 0);

		cqe = get_cqe(cq, ++i & cq->ibcq.cqe);

	}

	++cq->mcq.cons_index;