Commit 89944450 authored by Shamir Rabinovitch's avatar Shamir Rabinovitch Committed by Jason Gunthorpe
Browse files

IB/{hw,sw}: Remove 'uobject->context' dependency in object creation APIs 



Now when we have the udata passed to all the ib_xxx object creation APIs
and the additional macro 'rdma_udata_to_drv_context' to get the
ib_ucontext from ib_udata stored in uverbs_attr_bundle, we can finally
start to remove the dependency of the drivers in the
ib_xxx->uobject->context.

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

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+9 −11
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <rdma/ib_addr.h>

#include <rdma/ib_mad.h>

#include <rdma/ib_cache.h>

#include <rdma/uverbs_ioctl.h>



#include "bnxt_ulp.h"
@@ -722,12 +723,11 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 


	/* Write AVID to shared page. */

	if (udata) {

		struct ib_ucontext *ib_uctx = ib_pd->uobject->context;

		struct bnxt_re_ucontext *uctx;

		struct bnxt_re_ucontext *uctx = rdma_udata_to_drv_context(

			udata, struct bnxt_re_ucontext, ib_uctx);

		unsigned long flag;

		u32 *wrptr;



		uctx = container_of(ib_uctx, struct bnxt_re_ucontext, ib_uctx);

		spin_lock_irqsave(&uctx->sh_lock, flag);

		wrptr = (u32 *)(uctx->shpg + BNXT_RE_AVID_OFFT);

		*wrptr = ah->qplib_ah.id;
@@ -872,10 +872,9 @@ static int bnxt_re_init_user_qp(struct bnxt_re_dev *rdev, struct bnxt_re_pd *pd, 
	struct bnxt_qplib_qp *qplib_qp = &qp->qplib_qp;

	struct ib_umem *umem;

	int bytes = 0, psn_sz;

	struct ib_ucontext *context = pd->ib_pd.uobject->context;

	struct bnxt_re_ucontext *cntx = container_of(context,

						     struct bnxt_re_ucontext,

						     ib_uctx);

	struct bnxt_re_ucontext *cntx = rdma_udata_to_drv_context(

		udata, struct bnxt_re_ucontext, ib_uctx);



	if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))

		return -EFAULT;
@@ -1359,10 +1358,9 @@ static int bnxt_re_init_user_srq(struct bnxt_re_dev *rdev, 
	struct bnxt_qplib_srq *qplib_srq = &srq->qplib_srq;

	struct ib_umem *umem;

	int bytes = 0;

	struct ib_ucontext *context = pd->ib_pd.uobject->context;

	struct bnxt_re_ucontext *cntx = container_of(context,

						     struct bnxt_re_ucontext,

						     ib_uctx);

	struct bnxt_re_ucontext *cntx = rdma_udata_to_drv_context(

		udata, struct bnxt_re_ucontext, ib_uctx);



	if (ib_copy_from_udata(&ureq, udata, sizeof(ureq)))

		return -EFAULT;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+3 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <rdma/ib_smi.h>

#include <rdma/ib_umem.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/uverbs_ioctl.h>



#include "cxio_hal.h"

#include "iwch.h"
@@ -825,7 +826,8 @@ static struct ib_qp *iwch_create_qp(struct ib_pd *pd, 
	 * Kernel users need more wq space for fastreg WRs which can take

	 * 2 WR fragments.

	 */

	ucontext = udata ? to_iwch_ucontext(pd->uobject->context) : NULL;

	ucontext = rdma_udata_to_drv_context(udata, struct iwch_ucontext,

					     ibucontext);

	if (!ucontext && wqsize < (rqsize + (2 * sqsize)))

		wqsize = roundup_pow_of_two(rqsize +

				roundup_pow_of_two(attrs->cap.max_send_wr * 2));

drivers/infiniband/hw/cxgb4/qp.c

+5 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include <linux/module.h>

#include <rdma/uverbs_ioctl.h>



#include "iw_cxgb4.h"
@@ -2136,7 +2137,8 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, 
	struct c4iw_cq *rchp;

	struct c4iw_create_qp_resp uresp;

	unsigned int sqsize, rqsize = 0;

	struct c4iw_ucontext *ucontext;

	struct c4iw_ucontext *ucontext = rdma_udata_to_drv_context(

		udata, struct c4iw_ucontext, ibucontext);

	int ret;

	struct c4iw_mm_entry *sq_key_mm, *rq_key_mm = NULL, *sq_db_key_mm;

	struct c4iw_mm_entry *rq_db_key_mm = NULL, *ma_sync_key_mm = NULL;
@@ -2170,8 +2172,6 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, 
	if (sqsize < 8)

		sqsize = 8;



	ucontext = udata ? to_c4iw_ucontext(pd->uobject->context) : NULL;



	qhp = kzalloc(sizeof(*qhp), GFP_KERNEL);

	if (!qhp)

		return ERR_PTR(-ENOMEM);
@@ -2718,7 +2718,8 @@ struct ib_srq *c4iw_create_srq(struct ib_pd *pd, struct ib_srq_init_attr *attrs, 
	rqsize = attrs->attr.max_wr + 1;

	rqsize = roundup_pow_of_two(max_t(u16, rqsize, 16));



	ucontext = udata ? to_c4iw_ucontext(pd->uobject->context) : NULL;

	ucontext = rdma_udata_to_drv_context(udata, struct c4iw_ucontext,

					     ibucontext);



	srq = kzalloc(sizeof(*srq), GFP_KERNEL);

	if (!srq)

drivers/infiniband/hw/hns/hns_roce_qp.c

+9 −12
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/platform_device.h>

#include <rdma/ib_addr.h>

#include <rdma/ib_umem.h>

#include <rdma/uverbs_ioctl.h>

#include "hns_roce_common.h"

#include "hns_roce_device.h"

#include "hns_roce_hem.h"
@@ -560,6 +561,8 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, 
	struct device *dev = hr_dev->dev;

	struct hns_roce_ib_create_qp ucmd;

	struct hns_roce_ib_create_qp_resp resp = {};

	struct hns_roce_ucontext *uctx = rdma_udata_to_drv_context(

		udata, struct hns_roce_ucontext, ibucontext);

	unsigned long qpn = 0;

	int ret = 0;

	u32 page_shift;
@@ -670,9 +673,8 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, 
		    (udata->inlen >= sizeof(ucmd)) &&

		    (udata->outlen >= sizeof(resp)) &&

		    hns_roce_qp_has_sq(init_attr)) {

			ret = hns_roce_db_map_user(

				to_hr_ucontext(ib_pd->uobject->context), udata,

				ucmd.sdb_addr, &hr_qp->sdb);

			ret = hns_roce_db_map_user(uctx, udata, ucmd.sdb_addr,

						   &hr_qp->sdb);

			if (ret) {

				dev_err(dev, "sq record doorbell map failed!\n");

				goto err_mtt;
@@ -686,9 +688,8 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, 
		if ((hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) &&

		    (udata->outlen >= sizeof(resp)) &&

		    hns_roce_qp_has_rq(init_attr)) {

			ret = hns_roce_db_map_user(

				to_hr_ucontext(ib_pd->uobject->context), udata,

				ucmd.db_addr, &hr_qp->rdb);

			ret = hns_roce_db_map_user(uctx, udata, ucmd.db_addr,

						   &hr_qp->rdb);

			if (ret) {

				dev_err(dev, "rq record doorbell map failed!\n");

				goto err_sq_dbmap;
@@ -838,9 +839,7 @@ err_wrid: 
		if ((hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) &&

		    (udata->outlen >= sizeof(resp)) &&

		    hns_roce_qp_has_rq(init_attr))

			hns_roce_db_unmap_user(

					to_hr_ucontext(ib_pd->uobject->context),

					&hr_qp->rdb);

			hns_roce_db_unmap_user(uctx, &hr_qp->rdb);

	} else {

		kfree(hr_qp->sq.wrid);

		kfree(hr_qp->rq.wrid);
@@ -852,9 +851,7 @@ err_sq_dbmap: 
		    (udata->inlen >= sizeof(ucmd)) &&

		    (udata->outlen >= sizeof(resp)) &&

		    hns_roce_qp_has_sq(init_attr))

			hns_roce_db_unmap_user(

					to_hr_ucontext(ib_pd->uobject->context),

					&hr_qp->sdb);

			hns_roce_db_unmap_user(uctx, &hr_qp->sdb);



err_mtt:

	hns_roce_mtt_cleanup(hr_dev, &hr_qp->mtt);

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+5 −4
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <rdma/iw_cm.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/ib_umem.h>

#include <rdma/uverbs_ioctl.h>

#include "i40iw.h"



/**
@@ -556,7 +557,8 @@ static struct ib_qp *i40iw_create_qp(struct ib_pd *ibpd, 
	struct i40iw_device *iwdev = to_iwdev(ibpd->device);

	struct i40iw_cqp *iwcqp = &iwdev->cqp;

	struct i40iw_qp *iwqp;

	struct i40iw_ucontext *ucontext;

	struct i40iw_ucontext *ucontext = rdma_udata_to_drv_context(

		udata, struct i40iw_ucontext, ibucontext);

	struct i40iw_create_qp_req req;

	struct i40iw_create_qp_resp uresp;

	u32 qp_num = 0;
@@ -665,7 +667,6 @@ static struct ib_qp *i40iw_create_qp(struct ib_pd *ibpd, 
		}

		iwqp->ctx_info.qp_compl_ctx = req.user_compl_ctx;

		iwqp->user_mode = 1;

		ucontext = to_ucontext(ibpd->uobject->context);



		if (req.user_wqe_buffers) {

			struct i40iw_pbl *iwpbl;
@@ -1819,7 +1820,8 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, 
{

	struct i40iw_pd *iwpd = to_iwpd(pd);

	struct i40iw_device *iwdev = to_iwdev(pd->device);

	struct i40iw_ucontext *ucontext;

	struct i40iw_ucontext *ucontext = rdma_udata_to_drv_context(

		udata, struct i40iw_ucontext, ibucontext);

	struct i40iw_pble_alloc *palloc;

	struct i40iw_pbl *iwpbl;

	struct i40iw_mr *iwmr;
@@ -1860,7 +1862,6 @@ static struct ib_mr *i40iw_reg_user_mr(struct ib_pd *pd, 
	iwmr->region = region;

	iwmr->ibmr.pd = pd;

	iwmr->ibmr.device = pd->device;

	ucontext = to_ucontext(pd->uobject->context);



	iwmr->page_size = PAGE_SIZE;

	iwmr->page_msk = PAGE_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE