Commit 77528e2a authored by Aharon Landau's avatar Aharon Landau Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Reorder calls to pcie_relaxed_ordering_enabled() 

The mkc is the key for the mkey cache, hence, created in each attempt to
get a cache mkey, while pcie_relaxed_ordering_enabled() is called during
the setting of the mkc, but used only for cases where
IB_ACCESS_RELAXED_ORDERING is set.

pcie_relaxed_ordering_enabled() is an expensive call (26 us). Reorder the
code so the driver will call it only when it is needed.

Link: https://lore.kernel.org/r/684be1366cb1d4f05aa3e78986205e4bc410443a.1644947594.git.leonro@nvidia.com


Signed-off-by: default avatarAharon Landau <aharonl@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 9ee2516c

drivers/infiniband/hw/mlx5/mr.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ static void set_mkc_access_pd_addr_fields(void *mkc, int acc, u64 start_addr, 
					  struct ib_pd *pd)

					  struct ib_pd *pd)

{

{

	struct mlx5_ib_dev *dev = to_mdev(pd->device);

	struct mlx5_ib_dev *dev = to_mdev(pd->device);

	bool ro_pci_enabled = pcie_relaxed_ordering_enabled(dev->mdev->pdev);





	MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC));

	MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC));

	MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE));

	MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE));
@@ -76,12 +75,13 @@ static void set_mkc_access_pd_addr_fields(void *mkc, int acc, u64 start_addr, 
	MLX5_SET(mkc, mkc, lw, !!(acc & IB_ACCESS_LOCAL_WRITE));

	MLX5_SET(mkc, mkc, lw, !!(acc & IB_ACCESS_LOCAL_WRITE));

	MLX5_SET(mkc, mkc, lr, 1);

	MLX5_SET(mkc, mkc, lr, 1);





	if ((acc & IB_ACCESS_RELAXED_ORDERING) &&

	    pcie_relaxed_ordering_enabled(dev->mdev->pdev)) {

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

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

		MLX5_SET(mkc, mkc, relaxed_ordering_write,

			MLX5_SET(mkc, mkc, relaxed_ordering_write, 1);

			 (acc & IB_ACCESS_RELAXED_ORDERING) && ro_pci_enabled);

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

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

		MLX5_SET(mkc, mkc, relaxed_ordering_read,

			MLX5_SET(mkc, mkc, relaxed_ordering_read, 1);

			 (acc & IB_ACCESS_RELAXED_ORDERING) && ro_pci_enabled);

	}





	MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn);

	MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn);

	MLX5_SET(mkc, mkc, qpn, 0xffffff);

	MLX5_SET(mkc, mkc, qpn, 0xffffff);