Add per-ucontext list tracking for QP objects. Only RAW_PACKET QPs are tracked since they persist across reset events. RC, UD and GSI QPs are removed and re-added during reset by IB core and do not need tracking.
Signed-off-by: Long Li <[email protected]> --- drivers/infiniband/hw/mana/main.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 2 ++ drivers/infiniband/hw/mana/qp.c | 47 ++++++++++++++++++++++------ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index e6da5c8400f4..c6a859628ba3 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -244,6 +244,7 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext, mutex_init(&ucontext->lock); INIT_LIST_HEAD(&ucontext->pd_list); INIT_LIST_HEAD(&ucontext->cq_list); + INIT_LIST_HEAD(&ucontext->qp_list); INIT_LIST_HEAD(&ucontext->wq_list); mutex_lock(&mdev->ucontext_lock); diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 96b5a13470ae..9d90fda2c830 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -198,6 +198,7 @@ struct mana_ib_qp { refcount_t refcount; struct completion free; + struct list_head ucontext_list; }; struct mana_ib_ucontext { @@ -208,6 +209,7 @@ struct mana_ib_ucontext { struct mutex lock; struct list_head pd_list; struct list_head cq_list; + struct list_head qp_list; struct list_head wq_list; }; diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c index 82f84f7ad37a..315bc54d8ae6 100644 --- a/drivers/infiniband/hw/mana/qp.c +++ b/drivers/infiniband/hw/mana/qp.c @@ -700,14 +700,31 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp, struct ib_pd *ibpd, int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr, struct ib_udata *udata) { + struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp); + int err; + + INIT_LIST_HEAD(&qp->ucontext_list); + switch (attr->qp_type) { case IB_QPT_RAW_PACKET: /* When rwq_ind_tbl is used, it's for creating WQs for RSS */ if (attr->rwq_ind_tbl) - return mana_ib_create_qp_rss(ibqp, ibqp->pd, attr, - udata); + err = mana_ib_create_qp_rss(ibqp, ibqp->pd, attr, + udata); + else + err = mana_ib_create_qp_raw(ibqp, ibqp->pd, attr, + udata); + + if (!err && udata) { + struct mana_ib_ucontext *mana_ucontext = + rdma_udata_to_drv_context(udata, + struct mana_ib_ucontext, ibucontext); + mutex_lock(&mana_ucontext->lock); + list_add_tail(&qp->ucontext_list, &mana_ucontext->qp_list); + mutex_unlock(&mana_ucontext->lock); + } - return mana_ib_create_qp_raw(ibqp, ibqp->pd, attr, udata); + return err; case IB_QPT_RC: return mana_ib_create_rc_qp(ibqp, ibqp->pd, attr, udata); case IB_QPT_UD: @@ -716,9 +733,8 @@ int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr, default: ibdev_dbg(ibqp->device, "Creating QP type %u not supported\n", attr->qp_type); + return -EINVAL; } - - return -EINVAL; } static int mana_ib_gd_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, @@ -898,14 +914,26 @@ static int mana_ib_destroy_ud_qp(struct mana_ib_qp *qp, struct ib_udata *udata) int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) { struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp); + int ret = -ENOENT; switch (ibqp->qp_type) { case IB_QPT_RAW_PACKET: + if (udata) { + struct mana_ib_ucontext *mana_ucontext = + rdma_udata_to_drv_context(udata, + struct mana_ib_ucontext, ibucontext); + mutex_lock(&mana_ucontext->lock); + list_del_init(&qp->ucontext_list); + mutex_unlock(&mana_ucontext->lock); + } + if (ibqp->rwq_ind_tbl) - return mana_ib_destroy_qp_rss(qp, ibqp->rwq_ind_tbl, - udata); + ret = mana_ib_destroy_qp_rss(qp, ibqp->rwq_ind_tbl, + udata); + else + ret = mana_ib_destroy_qp_raw(qp, udata); - return mana_ib_destroy_qp_raw(qp, udata); + return ret; case IB_QPT_RC: return mana_ib_destroy_rc_qp(qp, udata); case IB_QPT_UD: @@ -914,7 +942,6 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) default: ibdev_dbg(ibqp->device, "Unexpected QP type %u\n", ibqp->qp_type); + return ret; } - - return -ENOENT; } -- 2.43.0
