diff options
| author | Moni Shoua <monis@mellanox.com> | 2019-08-15 11:38:33 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-08-20 13:44:45 -0400 |
| commit | 25a4517214ffa217a443181f7f885b914e6b328f (patch) | |
| tree | a742beff4fa4b44af7c7d61145599c5cab437805 /drivers | |
| parent | 008157528ac5658502c0f87e872778c56c41109c (diff) | |
| download | linux-stable-25a4517214ffa217a443181f7f885b914e6b328f.tar.gz linux-stable-25a4517214ffa217a443181f7f885b914e6b328f.tar.bz2 linux-stable-25a4517214ffa217a443181f7f885b914e6b328f.zip | |
IB/mlx5: Fix MR re-registration flow to use UMR properly
The UMR WQE in the MR re-registration flow requires that
modify_atomic and modify_entity_size capabilities are enabled.
Therefore, check that the these capabilities are present before going to
umr flow and go through slow path if not.
Fixes: c8d75a980fab ("IB/mlx5: Respect new UMR capabilities")
Signed-off-by: Moni Shoua <monis@mellanox.com>
Reviewed-by: Guy Levi <guyle@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20190815083834.9245-8-leon@kernel.org
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/mr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c index 8bce65c03b84..3401f5f6792e 100644 --- a/drivers/infiniband/hw/mlx5/mr.c +++ b/drivers/infiniband/hw/mlx5/mr.c @@ -1446,7 +1446,8 @@ int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start, goto err; } - if (flags & IB_MR_REREG_TRANS && !use_umr_mtt_update(mr, addr, len)) { + if (!mlx5_ib_can_use_umr(dev, true) || + (flags & IB_MR_REREG_TRANS && !use_umr_mtt_update(mr, addr, len))) { /* * UMR can't be used - MKey needs to be replaced. */ |