diff options
| author | Eli Cohen <eli@mellanox.com> | 2016-06-22 17:27:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-20 11:53:22 +0200 |
| commit | c0874b369269ef2d4db0d52c865d4b294c11db6e (patch) | |
| tree | 760a6522cee4e4808c590dfd7980360f49f5fbf3 | |
| parent | 2cff2b867310e4d7404a4272535661d6b6ea9df8 (diff) | |
| download | linux-stable-c0874b369269ef2d4db0d52c865d4b294c11db6e.tar.gz linux-stable-c0874b369269ef2d4db0d52c865d4b294c11db6e.tar.bz2 linux-stable-c0874b369269ef2d4db0d52c865d4b294c11db6e.zip | |
IB/mlx5: Fix post send fence logic
commit c9b254955b9f8814966f5dabd34c39d0e0a2b437 upstream.
If the caller specified IB_SEND_FENCE in the send flags of the work
request and no previous work request stated that the successive one
should be fenced, the work request would be executed without a fence.
This could result in RDMA read or atomic operations failure due to a MR
being invalidated. Fix this by adding the mlx5 enumeration for fencing
RDMA/atomic operations and fix the logic to apply this.
Fixes: e126ba97dba9 ('mlx5: Add driver for Mellanox Connect-IB adapters')
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/infiniband/hw/mlx5/qp.c | 7 | ||||
| -rw-r--r-- | include/linux/mlx5/qp.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 3c26b59cd8e7..f09678d817d3 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -2037,10 +2037,11 @@ static u8 get_fence(u8 fence, struct ib_send_wr *wr) return MLX5_FENCE_MODE_SMALL_AND_FENCE; else return fence; - - } else { - return 0; + } else if (unlikely(wr->send_flags & IB_SEND_FENCE)) { + return MLX5_FENCE_MODE_FENCE; } + + return 0; } int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h index ce21d29e18e7..6dcec3288870 100644 --- a/include/linux/mlx5/qp.h +++ b/include/linux/mlx5/qp.h @@ -137,6 +137,7 @@ enum { enum { MLX5_FENCE_MODE_NONE = 0 << 5, MLX5_FENCE_MODE_INITIATOR_SMALL = 1 << 5, + MLX5_FENCE_MODE_FENCE = 2 << 5, MLX5_FENCE_MODE_STRONG_ORDERING = 3 << 5, MLX5_FENCE_MODE_SMALL_AND_FENCE = 4 << 5, }; |