Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b91ffc1 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

IB/core: Get rid of redundant verb ib_destroy_mr 



This was added in a thought of uniting all mr allocation
and deallocation routines but the fact is we have a single
deallocation routine already, ib_dereg_mr.

And, move mlx5_ib_destroy_mr specific logic into mlx5_ib_dereg_mr
(includes only signature stuff for now).

And, fixup the only callers (iser/isert) accordingly.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent be688195

drivers/infiniband/core/verbs.c

+0 −17
Original line number Diff line number Diff line
@@ -1257,23 +1257,6 @@ struct ib_mr *ib_create_mr(struct ib_pd *pd, 
}

EXPORT_SYMBOL(ib_create_mr);



int ib_destroy_mr(struct ib_mr *mr)

{

	struct ib_pd *pd;

	int ret;



	if (atomic_read(&mr->usecnt))

		return -EBUSY;



	pd = mr->pd;

	ret = mr->device->destroy_mr(mr);

	if (!ret)

		atomic_dec(&pd->usecnt);



	return ret;

}

EXPORT_SYMBOL(ib_destroy_mr);



struct ib_mr *ib_alloc_fast_reg_mr(struct ib_pd *pd, int max_page_list_len)

{

	struct ib_mr *mr;

drivers/infiniband/hw/mlx5/main.c

+0 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,6 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->ib_dev.get_dma_mr		= mlx5_ib_get_dma_mr;

	dev->ib_dev.reg_user_mr		= mlx5_ib_reg_user_mr;

	dev->ib_dev.dereg_mr		= mlx5_ib_dereg_mr;

	dev->ib_dev.destroy_mr		= mlx5_ib_destroy_mr;

	dev->ib_dev.attach_mcast	= mlx5_ib_mcg_attach;

	dev->ib_dev.detach_mcast	= mlx5_ib_mcg_detach;

	dev->ib_dev.process_mad		= mlx5_ib_process_mad;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+0 −1
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
int mlx5_ib_update_mtt(struct mlx5_ib_mr *mr, u64 start_page_index,

		       int npages, int zap);

int mlx5_ib_dereg_mr(struct ib_mr *ibmr);

int mlx5_ib_destroy_mr(struct ib_mr *ibmr);

struct ib_mr *mlx5_ib_create_mr(struct ib_pd *pd,

				struct ib_mr_init_attr *mr_init_attr);

struct ib_mr *mlx5_ib_alloc_fast_reg_mr(struct ib_pd *pd,

drivers/infiniband/hw/mlx5/mr.c

+13 −30
Original line number Diff line number Diff line
@@ -1170,6 +1170,19 @@ static int clean_mr(struct mlx5_ib_mr *mr) 
	int umred = mr->umred;

	int err;



	if (mr->sig) {

		if (mlx5_core_destroy_psv(dev->mdev,

					  mr->sig->psv_memory.psv_idx))

			mlx5_ib_warn(dev, "failed to destroy mem psv %d\n",

				     mr->sig->psv_memory.psv_idx);

		if (mlx5_core_destroy_psv(dev->mdev,

					  mr->sig->psv_wire.psv_idx))

			mlx5_ib_warn(dev, "failed to destroy wire psv %d\n",

				     mr->sig->psv_wire.psv_idx);

		kfree(mr->sig);

		mr->sig = NULL;

	}



	if (!umred) {

		err = destroy_mkey(dev, mr);

		if (err) {
@@ -1317,36 +1330,6 @@ struct ib_mr *mlx5_ib_create_mr(struct ib_pd *pd, 
	return ERR_PTR(err);

}



int mlx5_ib_destroy_mr(struct ib_mr *ibmr)

{

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

	struct mlx5_ib_mr *mr = to_mmr(ibmr);

	int err;



	if (mr->sig) {

		if (mlx5_core_destroy_psv(dev->mdev,

					  mr->sig->psv_memory.psv_idx))

			mlx5_ib_warn(dev, "failed to destroy mem psv %d\n",

				     mr->sig->psv_memory.psv_idx);

		if (mlx5_core_destroy_psv(dev->mdev,

					  mr->sig->psv_wire.psv_idx))

			mlx5_ib_warn(dev, "failed to destroy wire psv %d\n",

				     mr->sig->psv_wire.psv_idx);

		kfree(mr->sig);

	}



	err = destroy_mkey(dev, mr);

	if (err) {

		mlx5_ib_warn(dev, "failed to destroy mkey 0x%x (%d)\n",

			     mr->mmr.key, err);

		return err;

	}



	kfree(mr);



	return err;

}



struct ib_mr *mlx5_ib_alloc_fast_reg_mr(struct ib_pd *pd,

					int max_page_list_len)

{

drivers/infiniband/ulp/iser/iser_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ iser_free_pi_ctx(struct iser_pi_context *pi_ctx) 
{

	ib_free_fast_reg_page_list(pi_ctx->prot_frpl);

	ib_dereg_mr(pi_ctx->prot_mr);

	ib_destroy_mr(pi_ctx->sig_mr);

	ib_dereg_mr(pi_ctx->sig_mr);

	kfree(pi_ctx);

}