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

RDMA: Restore ability to fail on AH destroy 

Like any other IB verbs objects, AH are refcounted by ib_core. The release
of those objects are controlled by ib_core with promise that AH destroy
can't fail.

Being SW object for now, this change makes dealloc_ah() to behave like any
other destroy IB flows.

Fixes: d3456914 ("RDMA: Handle AH allocations by IB/core")
Link: https://lore.kernel.org/r/20200907120921.476363-3-leon@kernel.org


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

drivers/infiniband/core/verbs.c

+6 −2
Original line number Diff line number Diff line
@@ -968,18 +968,22 @@ 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;



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

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

	if (ret)

		return ret;



	atomic_dec(&pd->usecnt);

	if (sgid_attr)

		rdma_put_gid_attr(sgid_attr);



	kfree(ah);

	return 0;

	return ret;

}

EXPORT_SYMBOL(rdma_destroy_ah_user);

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -602,13 +602,14 @@ int bnxt_re_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) 
}



/* Address Handles */

void bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags)

int 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;



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

			      !(flags & RDMA_DESTROY_AH_SLEEPABLE));

	return 0;

}



static u8 bnxt_re_stack_to_dev_nw_type(enum rdma_network_type ntype)

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int bnxt_re_create_ah(struct ib_ah *ah, struct rdma_ah_init_attr *init_attr, 
		      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);

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

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

int bnxt_re_create_srq(struct ib_srq *srq,

		       struct ib_srq_init_attr *srq_init_attr,

		       struct ib_udata *udata);

drivers/infiniband/hw/efa/efa.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void efa_mmap_free(struct rdma_user_mmap_entry *rdma_entry); 
int efa_create_ah(struct ib_ah *ibah,

		  struct rdma_ah_init_attr *init_attr,

		  struct ib_udata *udata);

void efa_destroy_ah(struct ib_ah *ibah, u32 flags);

int efa_destroy_ah(struct ib_ah *ibah, u32 flags);

int efa_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,

		  int qp_attr_mask, struct ib_udata *udata);

enum rdma_link_layer efa_port_link_layer(struct ib_device *ibdev,

drivers/infiniband/hw/efa/efa_verbs.c

+3 −2
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ int efa_create_ah(struct ib_ah *ibah, 
	return err;

}



void efa_destroy_ah(struct ib_ah *ibah, u32 flags)

int efa_destroy_ah(struct ib_ah *ibah, u32 flags)

{

	struct efa_dev *dev = to_edev(ibah->pd->device);

	struct efa_ah *ah = to_eah(ibah);
@@ -1883,10 +1883,11 @@ void efa_destroy_ah(struct ib_ah *ibah, u32 flags) 
	if (!(flags & RDMA_DESTROY_AH_SLEEPABLE)) {

		ibdev_dbg(&dev->ibdev,

			  "Destroy address handle is not supported in atomic context\n");

		return;

		return -EOPNOTSUPP;

	}



	efa_ah_destroy(dev, ah);

	return 0;

}



struct rdma_hw_stats *efa_alloc_hw_stats(struct ib_device *ibdev, u8 port_num)