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

RDMA: Cleanup undesired pd->uobject usage 



Drivers should be using udata to determine if a method is invoked from
user space or kernel space. A pd does not necessarily say a different
objects is kernel or user.

Transforming the tests to use udata eliminates a large number of uobject
references from the drivers.

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

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
	ah->qplib_ah.flow_label = grh->flow_label;

	ah->qplib_ah.hop_limit = grh->hop_limit;

	ah->qplib_ah.sl = rdma_ah_get_sl(ah_attr);

	if (ib_pd->uobject &&

	if (udata &&

	    !rdma_is_multicast_addr((struct in6_addr *)

				    grh->dgid.raw) &&

	    !rdma_link_local_addr((struct in6_addr *)
@@ -729,7 +729,7 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
	}



	/* Write AVID to shared page. */

	if (ib_pd->uobject) {

	if (udata) {

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

		struct bnxt_re_ucontext *uctx;

		unsigned long flag;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ 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 = pd->uobject ? to_iwch_ucontext(pd->uobject->context) : NULL;

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

	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

+2 −2
Original line number Diff line number Diff line
@@ -2163,7 +2163,7 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, 
	if (sqsize < 8)

		sqsize = 8;



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

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



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

	if (!qhp)
@@ -2712,7 +2712,7 @@ 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 = pd->uobject ? to_c4iw_ucontext(pd->uobject->context) : NULL;

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



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

	if (!srq)

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+1 −1
Original line number Diff line number Diff line
@@ -3926,7 +3926,7 @@ int hns_roce_v1_destroy_qp(struct ib_qp *ibqp) 
	struct hns_roce_qp_work *qp_work;

	struct hns_roce_v1_priv *priv;

	struct hns_roce_cq *send_cq, *recv_cq;

	int is_user = !!ibqp->pd->uobject;

	bool is_user = ibqp->uobject;

	int is_timeout = 0;

	int ret;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -4133,7 +4133,7 @@ out: 


static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,

					 struct hns_roce_qp *hr_qp,

					 int is_user)

					 bool is_user)

{

	struct hns_roce_cq *send_cq, *recv_cq;

	struct device *dev = hr_dev->dev;
@@ -4210,7 +4210,7 @@ static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp) 
	struct hns_roce_qp *hr_qp = to_hr_qp(ibqp);

	int ret;



	ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, !!ibqp->pd->uobject);

	ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, ibqp->uobject);

	if (ret) {

		dev_err(hr_dev->dev, "Destroy qp failed(%d)\n", ret);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE