Commit b0ea0fa5 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

IB/{core,hw}: Have ib_umem_get extract the ib_ucontext from ib_udata 



ib_umem_get() can only be called in a method callback, which always has a
udata parameter. This allows ib_umem_get() to derive the ucontext pointer
directly from the udata without requiring the drivers to find it in some
way or another.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarShamir Rabinovitch <shamir.rabinovitch@oracle.com>
parent 6fa8f1af

drivers/infiniband/core/umem.c

+7 −2
Original line number Diff line number Diff line
@@ -72,15 +72,16 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d 
 * If access flags indicate ODP memory, avoid pinning. Instead, stores

 * the mm for future page fault handling in conjunction with MMU notifiers.

 *

 * @context: userspace context to pin memory for

 * @udata: userspace context to pin memory for

 * @addr: userspace virtual address to start at

 * @size: length of region to pin

 * @access: IB_ACCESS_xxx flags for memory being pinned

 * @dmasync: flush in-flight DMA when the memory region is written

 */

struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,

struct ib_umem *ib_umem_get(struct ib_udata *udata, unsigned long addr,

			    size_t size, int access, int dmasync)

{

	struct ib_ucontext *context;

	struct ib_umem *umem;

	struct page **page_list;

	struct vm_area_struct **vma_list;
@@ -95,6 +96,10 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
	struct scatterlist *sg, *sg_list_start;

	unsigned int gup_flags = FOLL_WRITE;



	context = rdma_get_ucontext(udata);

	if (IS_ERR(context))

		return ERR_CAST(context);



	if (dmasync)

		dma_attrs |= DMA_ATTR_WRITE_BARRIER;

drivers/infiniband/core/uverbs_main.c

+24 −0
Original line number Diff line number Diff line
@@ -101,6 +101,30 @@ struct ib_ucontext *ib_uverbs_get_ucontext_file(struct ib_uverbs_file *ufile) 
}

EXPORT_SYMBOL(ib_uverbs_get_ucontext_file);



/* rdma_get_ucontext - Return the ucontext from a udata

 * @udata: The udata to get the context from

 *

 * This can only be called from within a uapi method that was passed ib_udata

 * as a parameter. It returns the ucontext associated with the udata, or ERR_PTR

 * if the udata is NULL or the ucontext has been disassociated.

 */

struct ib_ucontext *rdma_get_ucontext(struct ib_udata *udata)

{

	if (!udata)

		return ERR_PTR(-EIO);



	/*

	 * FIXME: Really all cases that get here with a udata will have

	 * already called ib_uverbs_get_ucontext_file, or located a uobject

	 * that points to a ucontext. We could store that result in the udata

	 * so this function can't fail.

	 */

	return ib_uverbs_get_ucontext_file(

		container_of(udata, struct uverbs_attr_bundle, driver_udata)

			->ufile);

}

EXPORT_SYMBOL(rdma_get_ucontext);



int uverbs_dealloc_mw(struct ib_mw *mw)

{

	struct ib_pd *pd = mw->pd;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+5 −8
Original line number Diff line number Diff line
@@ -895,8 +895,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, 
	if (qplib_qp->type == CMDQ_CREATE_QP_TYPE_RC)

		bytes += (qplib_qp->sq.max_wqe * sizeof(struct sq_psn_search));

	bytes = PAGE_ALIGN(bytes);

	umem = ib_umem_get(context, ureq.qpsva, bytes,

			   IB_ACCESS_LOCAL_WRITE, 1);

	umem = ib_umem_get(udata, ureq.qpsva, bytes, IB_ACCESS_LOCAL_WRITE, 1);

	if (IS_ERR(umem))

		return PTR_ERR(umem);
@@ -908,7 +907,7 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, 
	if (!qp->qplib_qp.srq) {

		bytes = (qplib_qp->rq.max_wqe * BNXT_QPLIB_MAX_RQE_ENTRY_SIZE);

		bytes = PAGE_ALIGN(bytes);

		umem = ib_umem_get(context, ureq.qprva, bytes,

		umem = ib_umem_get(udata, ureq.qprva, bytes,

				   IB_ACCESS_LOCAL_WRITE, 1);

		if (IS_ERR(umem))

			goto rqfail;
@@ -1370,8 +1369,7 @@ static int bnxt_re_init_user_srq(struct bnxt_re_dev *rdev, 


	bytes = (qplib_srq->max_wqe * BNXT_QPLIB_MAX_RQE_ENTRY_SIZE);

	bytes = PAGE_ALIGN(bytes);

	umem = ib_umem_get(context, ureq.srqva, bytes,

			   IB_ACCESS_LOCAL_WRITE, 1);

	umem = ib_umem_get(udata, ureq.srqva, bytes, IB_ACCESS_LOCAL_WRITE, 1);

	if (IS_ERR(umem))

		return PTR_ERR(umem);
@@ -2622,7 +2620,7 @@ struct ib_cq *bnxt_re_create_cq(struct ib_device *ibdev, 
			goto fail;

		}



		cq->umem = ib_umem_get(context, req.cq_va,

		cq->umem = ib_umem_get(udata, req.cq_va,

				       entries * sizeof(struct cq_base),

				       IB_ACCESS_LOCAL_WRITE, 1);

		if (IS_ERR(cq->umem)) {
@@ -3589,8 +3587,7 @@ struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *ib_pd, u64 start, u64 length, 
	/* The fixed portion of the rkey is the same as the lkey */

	mr->ib_mr.rkey = mr->qplib_mr.rkey;



	umem = ib_umem_get(ib_pd->uobject->context, start, length,

			   mr_access_flags, 0);

	umem = ib_umem_get(udata, start, length, mr_access_flags, 0);

	if (IS_ERR(umem)) {

		dev_err(rdev_to_dev(rdev), "Failed to get umem");

		rc = -EFAULT;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 


	mhp->rhp = rhp;



	mhp->umem = ib_umem_get(pd->uobject->context, start, length, acc, 0);

	mhp->umem = ib_umem_get(udata, start, length, acc, 0);

	if (IS_ERR(mhp->umem)) {

		err = PTR_ERR(mhp->umem);

		kfree(mhp);

drivers/infiniband/hw/cxgb4/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 


	mhp->rhp = rhp;



	mhp->umem = ib_umem_get(pd->uobject->context, start, length, acc, 0);

	mhp->umem = ib_umem_get(udata, start, length, acc, 0);

	if (IS_ERR(mhp->umem))

		goto err_free_skb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE