Commit 454892c3 authored Nov 05, 2018 by Majd Dibbiny Committed by Greg Kroah-Hartman Dec 17, 2018

RDMA/mlx5: Fix fence type for IB_WR_LOCAL_INV WR



[ Upstream commit 074fca3a18e7e1e0d4d7dcc9d7badc43b90232f4 ]

Currently, for IB_WR_LOCAL_INV WR, when the next fence is None, the
current fence will be SMALL instead of Normal Fence.

Without this patch krping doesn't work on CX-5 devices and throws
following error:

The error messages are from CX5 driver are: (from server side)
[ 710.434014] mlx5_0:dump_cqe:278:(pid 2712): dump error cqe
[ 710.434016] 00000000 00000000 00000000 00000000
[ 710.434016] 00000000 00000000 00000000 00000000
[ 710.434017] 00000000 00000000 00000000 00000000
[ 710.434018] 00000000 93003204 100000b8 000524d2
[ 710.434019] krping: cq completion failed with wr_id 0 status 4 opcode 128 vender_err 32

Fixed the logic to set the correct fence type.

Fixes: 6e8484c5cf07 ("RDMA/mlx5: set UMR wqe fence according to HCA cap")
Signed-off-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent aeda9163

drivers/infiniband/hw/mlx5/qp.c

+10 −9

Original line number	Diff line number	Diff line
		@@ -3888,11 +3888,11 @@ int mlx5_ib_post_send(struct ib_qp ibqp, struct ib_send_wr wr,
		goto out;
		}

		if (wr->opcode == IB_WR_LOCAL_INV \|\|
		wr->opcode == IB_WR_REG_MR) {
		if (wr->opcode == IB_WR_REG_MR) {
		fence = dev->umr_fence;
		next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL;
		} else if (wr->send_flags & IB_SEND_FENCE) {
		} else {
		if (wr->send_flags & IB_SEND_FENCE) {
		if (qp->next_fence)
		fence = MLX5_FENCE_MODE_SMALL_AND_FENCE;
		else
		@@ -3900,6 +3900,7 @@ int mlx5_ib_post_send(struct ib_qp ibqp, struct ib_send_wr wr,
		} else {
		fence = qp->next_fence;
		}
		}

		switch (ibqp->qp_type) {
		case IB_QPT_XRC_INI: