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

Commit 5ef990f0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Doug Ledford
Browse files

IB/core: remove ib_get_dma_mr 



We now only use it from ib_alloc_pd to create a local DMA lkey if the
device doesn't provide one, or a global rkey if the ULP requests it.

This patch removes ib_get_dma_mr and open codes the functionality in
ib_alloc_pd so that we can simplify the code and prevent abuse of the
functionality.  As a side effect we can also simplify things by removing
the valid access bit check, and the PD refcounting.

In the future I hope to also remove the per-PD global MR entirely by
shifting this work into the HW drivers, as one step towards avoiding
the struct ib_mr overload for various different use cases.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 11975e01

drivers/infiniband/core/verbs.c

+8 −26
Original line number Diff line number Diff line
@@ -256,12 +256,17 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags, 
	if (mr_access_flags) {

		struct ib_mr *mr;



		mr = ib_get_dma_mr(pd, mr_access_flags);

		mr = pd->device->get_dma_mr(pd, mr_access_flags);

		if (IS_ERR(mr)) {

			ib_dealloc_pd(pd);

			return (struct ib_pd *)mr;

			return ERR_CAST(mr);

		}



		mr->device	= pd->device;

		mr->pd		= pd;

		mr->uobject	= NULL;

		mr->need_inval	= false;



		pd->__internal_mr = mr;



		if (!(device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY))
@@ -288,7 +293,7 @@ void ib_dealloc_pd(struct ib_pd *pd) 
	int ret;



	if (pd->__internal_mr) {

		ret = ib_dereg_mr(pd->__internal_mr);

		ret = pd->device->dereg_mr(pd->__internal_mr);

		WARN_ON(ret);

		pd->__internal_mr = NULL;

	}
@@ -1408,29 +1413,6 @@ EXPORT_SYMBOL(ib_resize_cq); 


/* Memory regions */



struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags)

{

	struct ib_mr *mr;

	int err;



	err = ib_check_mr_access(mr_access_flags);

	if (err)

		return ERR_PTR(err);



	mr = pd->device->get_dma_mr(pd, mr_access_flags);



	if (!IS_ERR(mr)) {

		mr->device  = pd->device;

		mr->pd      = pd;

		mr->uobject = NULL;

		atomic_inc(&pd->usecnt);

		mr->need_inval = false;

	}



	return mr;

}

EXPORT_SYMBOL(ib_get_dma_mr);



int ib_dereg_mr(struct ib_mr *mr)

{

	struct ib_pd *pd = mr->pd;

include/rdma/ib_verbs.h

+0 −12
Original line number Diff line number Diff line
@@ -2878,18 +2878,6 @@ static inline int ib_req_ncomp_notif(struct ib_cq *cq, int wc_cnt) 
		-ENOSYS;

}



/**

 * ib_get_dma_mr - Returns a memory region for system memory that is

 *   usable for DMA.

 * @pd: The protection domain associated with the memory region.

 * @mr_access_flags: Specifies the memory access rights.

 *

 * Note that the ib_dma_*() functions defined below must be used

 * to create/destroy addresses used with the Lkey or Rkey returned

 * by ib_get_dma_mr().

 */

struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags);



/**

 * ib_dma_mapping_error - check a DMA addr for error

 * @dev: The device for which the dma_addr was created