Commit 0e6613b4 authored by Moni Shoua's avatar Moni Shoua Committed by Doug Ledford
Browse files

IB/mlx5: Consolidate use_umr checks into single function 



Introduce helper function to unify various use_umr checks.

Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20190815083834.9245-6-leon@kernel.org


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 60c78668

drivers/infiniband/hw/mlx5/mlx5_ib.h

+14 −0
Original line number Diff line number Diff line
@@ -1475,4 +1475,18 @@ int bfregn_to_uar_index(struct mlx5_ib_dev *dev, 
			bool dyn_bfreg);



int mlx5_ib_qp_set_counter(struct ib_qp *qp, struct rdma_counter *counter);



static inline bool mlx5_ib_can_use_umr(struct mlx5_ib_dev *dev,

				       bool do_modify_atomic)

{

	if (MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled))

		return false;



	if (do_modify_atomic &&

	    MLX5_CAP_GEN(dev->mdev, atomic) &&

	    MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled))

		return false;



	return true;

}

#endif /* MLX5_IB_H */

drivers/infiniband/hw/mlx5/mr.c

+1 −3
Original line number Diff line number Diff line
@@ -1293,9 +1293,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	if (err < 0)

		return ERR_PTR(err);



	use_umr = !MLX5_CAP_GEN(dev->mdev, umr_modify_entity_size_disabled) &&

		  (!MLX5_CAP_GEN(dev->mdev, umr_modify_atomic_disabled) ||

		   !MLX5_CAP_GEN(dev->mdev, atomic));

	use_umr = mlx5_ib_can_use_umr(dev, true);



	if (order <= mr_cache_max_order(dev) && use_umr) {

		mr = alloc_mr_from_cache(pd, umem, virt_addr, length, ncont,

CRA Git | Maintained and supported by SUSTech CRA and CCSE