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

Commit d3456914 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA: Handle AH allocations by IB/core 



Simplify drivers by ensuring lifetime of ib_ah object. The changes
in .create_ah() go hand in hand with relevant update in .destroy_ah().

We will use this opportunity and convert .destroy_ah() to don't fail, as
it was suggested a long time ago, because there is nothing to do in case
of failure during destroy.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent f6316032

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2222,6 +2222,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, set_vf_link_state);

	SET_DEVICE_OP(dev_ops, unmap_fmr);



	SET_OBJ_SIZE(dev_ops, ib_ah);

	SET_OBJ_SIZE(dev_ops, ib_pd);

	SET_OBJ_SIZE(dev_ops, ib_ucontext);

}

drivers/infiniband/core/verbs.c

+24 −17
Original line number Diff line number Diff line
@@ -496,25 +496,33 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, 
				     u32 flags,

				     struct ib_udata *udata)

{

	struct ib_device *device = pd->device;

	struct ib_ah *ah;

	int ret;



	might_sleep_if(flags & RDMA_CREATE_AH_SLEEPABLE);



	if (!pd->device->ops.create_ah)

	if (!device->ops.create_ah)

		return ERR_PTR(-EOPNOTSUPP);



	ah = pd->device->ops.create_ah(pd, ah_attr, flags, udata);

	ah = rdma_zalloc_drv_obj_gfp(

		device, ib_ah,

		(flags & RDMA_CREATE_AH_SLEEPABLE) ? GFP_KERNEL : GFP_ATOMIC);

	if (!ah)

		return ERR_PTR(-ENOMEM);



	if (!IS_ERR(ah)) {

		ah->device  = pd->device;

	ah->device = device;

	ah->pd = pd;

		ah->uobject = NULL;

	ah->type = ah_attr->type;

	ah->sgid_attr = rdma_update_sgid_attr(ah_attr, NULL);



		atomic_inc(&pd->usecnt);

	ret = device->ops.create_ah(ah, ah_attr, flags, udata);

	if (ret) {

		kfree(ah);

		return ERR_PTR(ret);

	}



	atomic_inc(&pd->usecnt);

	return ah;

}
@@ -935,19 +943,18 @@ int rdma_destroy_ah_user(struct ib_ah *ah, u32 flags, struct ib_udata *udata) 
{

	const struct ib_gid_attr *sgid_attr = ah->sgid_attr;

	struct ib_pd *pd;

	int ret;



	might_sleep_if(flags & RDMA_DESTROY_AH_SLEEPABLE);



	pd = ah->pd;

	ret = ah->device->ops.destroy_ah(ah, flags, udata);

	if (!ret) {



	ah->device->ops.destroy_ah(ah, flags);

	atomic_dec(&pd->usecnt);

	if (sgid_attr)

		rdma_put_gid_attr(sgid_attr);

	}



	return ret;

	kfree(ah);

	return 0;

}

EXPORT_SYMBOL(rdma_destroy_ah_user);

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+12 −32
Original line number Diff line number Diff line
@@ -633,20 +633,13 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) 
}



/* Address Handles */

int bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags, struct ib_udata *udata)

void bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags)

{

	struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);

	struct bnxt_re_dev *rdev = ah->rdev;

	int rc;



	rc = bnxt_qplib_destroy_ah(&rdev->qplib_res, &ah->qplib_ah,

	bnxt_qplib_destroy_ah(&rdev->qplib_res, &ah->qplib_ah,

			      !(flags & RDMA_DESTROY_AH_SLEEPABLE));

	if (rc) {

		dev_err(rdev_to_dev(rdev), "Failed to destroy HW AH");

		return rc;

	}

	kfree(ah);

	return 0;

}



static u8 bnxt_re_stack_to_dev_nw_type(enum rdma_network_type ntype)
@@ -667,26 +660,22 @@ static u8 bnxt_re_stack_to_dev_nw_type(enum rdma_network_type ntype) 
	return nw_type;

}



struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd,

				struct rdma_ah_attr *ah_attr,

				u32 flags,

				struct ib_udata *udata)

int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,

		      u32 flags, struct ib_udata *udata)

{

	struct ib_pd *ib_pd = ib_ah->pd;

	struct bnxt_re_pd *pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);

	const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);

	struct bnxt_re_dev *rdev = pd->rdev;

	const struct ib_gid_attr *sgid_attr;

	struct bnxt_re_ah *ah;

	struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);

	u8 nw_type;

	int rc;



	if (!(rdma_ah_get_ah_flags(ah_attr) & IB_AH_GRH)) {

		dev_err(rdev_to_dev(rdev), "Failed to alloc AH: GRH not set");

		return ERR_PTR(-EINVAL);

		return -EINVAL;

	}

	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);

	if (!ah)

		return ERR_PTR(-ENOMEM);



	ah->rdev = rdev;

	ah->qplib_ah.pd = &pd->qplib_pd;
@@ -716,7 +705,7 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
				  !(flags & RDMA_CREATE_AH_SLEEPABLE));

	if (rc) {

		dev_err(rdev_to_dev(rdev), "Failed to allocate HW AH");

		goto fail;

		return rc;

	}



	/* Write AVID to shared page. */
@@ -733,11 +722,7 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
		spin_unlock_irqrestore(&uctx->sh_lock, flag);

	}



	return &ah->ib_ah;



fail:

	kfree(ah);

	return ERR_PTR(rc);

	return 0;

}



int bnxt_re_modify_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr)
@@ -810,13 +795,8 @@ int bnxt_re_destroy_qp(struct ib_qp *ib_qp, struct ib_udata *udata) 
	bnxt_qplib_free_qp_res(&rdev->qplib_res, &qp->qplib_qp);



	if (ib_qp->qp_type == IB_QPT_GSI && rdev->qp1_sqp) {

		rc = bnxt_qplib_destroy_ah(&rdev->qplib_res,

					   &rdev->sqp_ah->qplib_ah, false);

		if (rc) {

			dev_err(rdev_to_dev(rdev),

				"Failed to destroy HW AH for shadow QP");

			return rc;

		}

		bnxt_qplib_destroy_ah(&rdev->qplib_res, &rdev->sqp_ah->qplib_ah,

				      false);



		bnxt_qplib_clean_qp(&qp->qplib_qp);

		rc = bnxt_qplib_destroy_qp(&rdev->qplib_res,

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+4 −6
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ struct bnxt_re_pd { 
};



struct bnxt_re_ah {

	struct bnxt_re_dev	*rdev;

	struct ib_ah		ib_ah;

	struct bnxt_re_dev	*rdev;

	struct bnxt_qplib_ah	qplib_ah;

};
@@ -165,13 +165,11 @@ enum rdma_link_layer bnxt_re_get_link_layer(struct ib_device *ibdev, 
					    u8 port_num);

int bnxt_re_alloc_pd(struct ib_pd *pd, struct ib_udata *udata);

void bnxt_re_dealloc_pd(struct ib_pd *pd, struct ib_udata *udata);

struct ib_ah *bnxt_re_create_ah(struct ib_pd *pd,

				struct rdma_ah_attr *ah_attr,

				u32 flags,

int bnxt_re_create_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr, u32 flags,

		      struct ib_udata *udata);

int bnxt_re_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);

int bnxt_re_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);

int bnxt_re_destroy_ah(struct ib_ah *ah, u32 flags, struct ib_udata *udata);

void bnxt_re_destroy_ah(struct ib_ah *ah, u32 flags);

struct ib_srq *bnxt_re_create_srq(struct ib_pd *pd,

				  struct ib_srq_init_attr *srq_init_attr,

				  struct ib_udata *udata);

drivers/infiniband/hw/bnxt_re/main.c

+1 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ static const struct ib_device_ops bnxt_re_dev_ops = { 
	.query_srq = bnxt_re_query_srq,

	.reg_user_mr = bnxt_re_reg_user_mr,

	.req_notify_cq = bnxt_re_req_notify_cq,

	INIT_RDMA_OBJ_SIZE(ib_ah, bnxt_re_ah, ib_ah),

	INIT_RDMA_OBJ_SIZE(ib_pd, bnxt_re_pd, ib_pd),

	INIT_RDMA_OBJ_SIZE(ib_ucontext, bnxt_re_ucontext, ib_uctx),

};