Commit 85f9e38a authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

RDMA/mlx5: Remove impossible check of mkey cache cleanup failure 

mlx5_mkey_cache_cleanup() can't fail and can be changed to be void.

Link: https://lore.kernel.org/r/1acd9528995d083114e7dec2a2afc59436406583.1675328463.git.leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent 828cf593

drivers/infiniband/hw/mlx5/main.c

+1 −6
Original line number Diff line number Diff line
@@ -4000,12 +4000,7 @@ static int mlx5_ib_stage_ib_reg_init(struct mlx5_ib_dev *dev) 


static void mlx5_ib_stage_pre_ib_reg_umr_cleanup(struct mlx5_ib_dev *dev)

{

	int err;



	err = mlx5_mkey_cache_cleanup(dev);

	if (err)

		mlx5_ib_warn(dev, "mr cache cleanup failed\n");



	mlx5_mkey_cache_cleanup(dev);

	mlx5r_umr_resource_cleanup(dev);

}

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ void mlx5_ib_populate_pas(struct ib_umem *umem, size_t page_size, __be64 *pas, 
void mlx5_ib_copy_pas(u64 *old, u64 *new, int step, int num);

int mlx5_ib_get_cqe_size(struct ib_cq *ibcq);

int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev);

int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev);

void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev);

struct mlx5_cache_ent *

mlx5r_cache_create_ent_locked(struct mlx5_ib_dev *dev,

			      struct mlx5r_cache_rb_key rb_key,

drivers/infiniband/hw/mlx5/mr.c

+2 −4
Original line number Diff line number Diff line
@@ -1011,14 +1011,14 @@ int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev) 
	return ret;

}



int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev)

void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev)

{

	struct rb_root *root = &dev->cache.rb_root;

	struct mlx5_cache_ent *ent;

	struct rb_node *node;



	if (!dev->cache.wq)

		return 0;

		return;



	cancel_delayed_work_sync(&dev->cache.remove_ent_dwork);

	mutex_lock(&dev->cache.rb_lock);
@@ -1045,8 +1045,6 @@ int mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev) 


	destroy_workqueue(dev->cache.wq);

	del_timer_sync(&dev->delay_timer);



	return 0;

}



struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)