Add per-ucontext list tracking for CQ objects. Each CQ is added to the ucontext's cq_list on creation and removed on destruction. This enables iterating over all CQs belonging to a ucontext for service reset cleanup.
Signed-off-by: Long Li <[email protected]> --- drivers/infiniband/hw/mana/cq.c | 19 +++++++++++++++++++ drivers/infiniband/hw/mana/main.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c index b2749f971cd0..89cf60987ff5 100644 --- a/drivers/infiniband/hw/mana/cq.c +++ b/drivers/infiniband/hw/mana/cq.c @@ -95,6 +95,16 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, INIT_LIST_HEAD(&cq->list_send_qp); INIT_LIST_HEAD(&cq->list_recv_qp); + INIT_LIST_HEAD(&cq->ucontext_list); + 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_add_tail(&cq->ucontext_list, &mana_ucontext->cq_list); + mutex_unlock(&mana_ucontext->lock); + } + return 0; err_remove_cq_cb: @@ -115,6 +125,15 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + 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(&cq->ucontext_list); + mutex_unlock(&mana_ucontext->lock); + } + mana_ib_remove_cq_cb(mdev, cq); /* Ignore return code as there is not much we can do about it. diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index 62d89ca06ba1..214c1d4e1548 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -243,6 +243,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); mutex_lock(&mdev->ucontext_lock); list_add_tail(&ucontext->dev_list, &mdev->ucontext_list); diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 6dba08bccc18..8d3edf7ba335 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -150,6 +150,7 @@ struct mana_ib_cq { int cqe; u32 comp_vector; mana_handle_t cq_handle; + struct list_head ucontext_list; }; enum mana_rc_queue_type { @@ -205,6 +206,7 @@ struct mana_ib_ucontext { /* Protects resource lists below */ struct mutex lock; struct list_head pd_list; + struct list_head cq_list; }; struct mana_ib_rwq_ind_table { -- 2.43.0
