Commit e5dc370b authored by Shay Drory's avatar Shay Drory Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Set ODP caps only if device profile support ODP 

Currently, ODP caps are set during the init stage of mlx5_ib_dev,
regardless of whether the device profile supports ODP or not.  There is no
point in setting ODP caps if the device profile doesn't support
ODP. Hence, move setting the ODP caps to the odp_init stage.

Link: https://lore.kernel.org/r/20210318135259.681264-1-leon@kernel.org


Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c7370080

drivers/infiniband/hw/mlx5/main.c

+0 −2
Original line number Diff line number Diff line
@@ -3894,8 +3894,6 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) 
		dev->port[i].roce.last_port_state = IB_PORT_DOWN;

	}



	mlx5_ib_internal_fill_odp_caps(dev);



	err = mlx5_ib_init_multiport_master(dev);

	if (err)

		return err;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+0 −6
Original line number Diff line number Diff line
@@ -1357,7 +1357,6 @@ struct ib_mr *mlx5_ib_reg_dm_mr(struct ib_pd *pd, struct ib_dm *dm, 
				struct uverbs_attr_bundle *attrs);



#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev);

int mlx5_ib_odp_init_one(struct mlx5_ib_dev *ibdev);

int mlx5r_odp_create_eq(struct mlx5_ib_dev *dev, struct mlx5_ib_pf_eq *eq);

void mlx5_ib_odp_cleanup_one(struct mlx5_ib_dev *ibdev);
@@ -1373,11 +1372,6 @@ int mlx5_ib_advise_mr_prefetch(struct ib_pd *pd, 
int mlx5_ib_init_odp_mr(struct mlx5_ib_mr *mr);

int mlx5_ib_init_dmabuf_mr(struct mlx5_ib_mr *mr);

#else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */

static inline void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)

{

	return;

}



static inline int mlx5_ib_odp_init_one(struct mlx5_ib_dev *ibdev) { return 0; }

static inline int mlx5r_odp_create_eq(struct mlx5_ib_dev *dev,

				      struct mlx5_ib_pf_eq *eq)

drivers/infiniband/hw/mlx5/odp.c

+3 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ const struct mmu_interval_notifier_ops mlx5_mn_ops = { 
	.invalidate = mlx5_ib_invalidate_range,

};



void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)

static void internal_fill_odp_caps(struct mlx5_ib_dev *dev)

{

	struct ib_odp_caps *caps = &dev->odp_caps;
@@ -1639,6 +1639,8 @@ int mlx5_ib_odp_init_one(struct mlx5_ib_dev *dev) 
{

	int ret = 0;



	internal_fill_odp_caps(dev);



	if (!(dev->odp_caps.general_caps & IB_ODP_SUPPORT))

		return ret;