Add per-ucontext list tracking for MR objects. Each MR is added to the ucontext's mr_list on creation and removed on destruction. This enables iterating over all MRs belonging to a ucontext for service reset cleanup.
Also export mana_ib_gd_destroy_mr() for use by reset cleanup code. Signed-off-by: Long Li <[email protected]> --- drivers/infiniband/hw/mana/main.c | 1 + drivers/infiniband/hw/mana/mana_ib.h | 3 +++ drivers/infiniband/hw/mana/mr.c | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index c6a859628ba3..f739e6da5435 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->mr_list); INIT_LIST_HEAD(&ucontext->cq_list); INIT_LIST_HEAD(&ucontext->qp_list); INIT_LIST_HEAD(&ucontext->wq_list); diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 9d90fda2c830..ce5c6c030fb2 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -134,6 +134,7 @@ struct mana_ib_mr { struct ib_mr ibmr; struct ib_umem *umem; mana_handle_t mr_handle; + struct list_head ucontext_list; }; struct mana_ib_dm { @@ -208,6 +209,7 @@ struct mana_ib_ucontext { /* Protects resource lists below */ struct mutex lock; struct list_head pd_list; + struct list_head mr_list; struct list_head cq_list; struct list_head qp_list; struct list_head wq_list; @@ -665,6 +667,7 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, struct ib_udata *udata); int mana_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata); +int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle); int mana_ib_create_qp(struct ib_qp *qp, struct ib_qp_init_attr *qp_init_attr, struct ib_udata *udata); diff --git a/drivers/infiniband/hw/mana/mr.c b/drivers/infiniband/hw/mana/mr.c index 9613b225dad4..559bb4f7c31d 100644 --- a/drivers/infiniband/hw/mana/mr.c +++ b/drivers/infiniband/hw/mana/mr.c @@ -87,7 +87,7 @@ static int mana_ib_gd_create_mr(struct mana_ib_dev *dev, struct mana_ib_mr *mr, return 0; } -static int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle) +int mana_ib_gd_destroy_mr(struct mana_ib_dev *dev, u64 mr_handle) { struct gdma_destroy_mr_response resp = {}; struct gdma_destroy_mr_request req = {}; @@ -185,6 +185,16 @@ struct ib_mr *mana_ib_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 length, * as part of the lifecycle of this MR. */ + INIT_LIST_HEAD(&mr->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(&mr->ucontext_list, &mana_ucontext->mr_list); + mutex_unlock(&mana_ucontext->lock); + } + return &mr->ibmr; err_dma_region: @@ -313,6 +323,15 @@ int mana_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) dev = 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(&mr->ucontext_list); + mutex_unlock(&mana_ucontext->lock); + } + err = mana_ib_gd_destroy_mr(dev, mr->mr_handle); if (err) return err; -- 2.43.0
