RDMA/mlx5: Set ODP caps only if device profile support ODP
Subsystems (2)
PATCH 1/1 RDMA/mlx5: Set ODP caps only if device profile support ODP
From: Shay Drory <[email protected]>
Currently, ODP caps are set during the init stage of mlx5_ib_dev, regardless whether the device profile supports ODP or not. There isn't a point to set ODP caps if the device profile doesn't supports ODP. Hence, setting the ODP caps in the odp_init stage.
Reviewed-by Maor Gottlieb <[email protected]>
Signed-off-by Shay Drory <[email protected]>
Signed-off-by Leon Romanovsky <[email protected]>
--- drivers/infiniband/hw/mlx5/main.c | 2 -- drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 ------ drivers/infiniband/hw/mlx5/odp.c | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-)
drivers/infiniband/hw/mlx5/main.c +0 -2
@@ -3665,8 +3665,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
@@ -1372,7 +1372,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);
@@ -1388,11 +1387,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
@@ -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;
Signature · 1 line
2.30.2
Quoted 7 lines · Leon Romanovsky
From: Shay Drory <[email protected]>
Currently, ODP caps are set during the init stage of
mlx5_ib_dev, regardless whether the device profile supports ODP or not. There isn't a point to set ODP caps if the device profile doesn't supports ODP. Hence, setting the ODP caps in theodp_initstage.
Quoted 8 lines
Reviewed-by Maor Gottlieb <[email protected]>Signed-off-by Shay Drory <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- drivers/infiniband/hw/mlx5/main.c | 2 -- drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 ------ drivers/infiniband/hw/mlx5/odp.c | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-)
Applied to for-next, thanks
Jason