Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Aharon Landau <aharonl@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

authored by

Aharon Landau and committed by
Jason Gunthorpe
77528e2a 9ee2516c

+7 -7
+7 -7
drivers/infiniband/hw/mlx5/mr.c
··· 68 68 struct ib_pd *pd) 69 69 { 70 70 struct mlx5_ib_dev *dev = to_mdev(pd->device); 71 - bool ro_pci_enabled = pcie_relaxed_ordering_enabled(dev->mdev->pdev); 72 71 73 72 MLX5_SET(mkc, mkc, a, !!(acc & IB_ACCESS_REMOTE_ATOMIC)); 74 73 MLX5_SET(mkc, mkc, rw, !!(acc & IB_ACCESS_REMOTE_WRITE)); ··· 75 76 MLX5_SET(mkc, mkc, lw, !!(acc & IB_ACCESS_LOCAL_WRITE)); 76 77 MLX5_SET(mkc, mkc, lr, 1); 77 78 78 - if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write)) 79 - MLX5_SET(mkc, mkc, relaxed_ordering_write, 80 - (acc & IB_ACCESS_RELAXED_ORDERING) && ro_pci_enabled); 81 - if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read)) 82 - MLX5_SET(mkc, mkc, relaxed_ordering_read, 83 - (acc & IB_ACCESS_RELAXED_ORDERING) && ro_pci_enabled); 79 + if ((acc & IB_ACCESS_RELAXED_ORDERING) && 80 + pcie_relaxed_ordering_enabled(dev->mdev->pdev)) { 81 + if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write)) 82 + MLX5_SET(mkc, mkc, relaxed_ordering_write, 1); 83 + if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read)) 84 + MLX5_SET(mkc, mkc, relaxed_ordering_read, 1); 85 + } 84 86 85 87 MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn); 86 88 MLX5_SET(mkc, mkc, qpn, 0xffffff);