Add per-device tracking of ucontext objects. Each ucontext is added to the device's ucontext_list on allocation and removed on deallocation. A mutex protects the list and a per-ucontext lock protects resource lists that will be added in subsequent patches.
This enables iterating over all active ucontexts during service reset cleanup. Signed-off-by: Long Li <[email protected]> --- drivers/infiniband/hw/mana/device.c | 2 ++ drivers/infiniband/hw/mana/main.c | 10 ++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c index ccc2279ca63c..149e8d4d5b8e 100644 --- a/drivers/infiniband/hw/mana/device.c +++ b/drivers/infiniband/hw/mana/device.c @@ -132,6 +132,8 @@ static int mana_ib_probe(struct auxiliary_device *adev, dev->ib_dev.dev.parent = gc->dev; dev->gdma_dev = mdev; xa_init_flags(&dev->qp_table_wq, XA_FLAGS_LOCK_IRQ); + mutex_init(&dev->ucontext_lock); + INIT_LIST_HEAD(&dev->ucontext_list); if (mana_ib_is_rnic(dev)) { dev->ib_dev.phys_port_cnt = 1; diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index 8d99cd00f002..fc28bdafcfd6 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -221,6 +221,12 @@ int mana_ib_alloc_ucontext(struct ib_ucontext *ibcontext, ucontext->doorbell = doorbell_page; + mutex_init(&ucontext->lock); + + mutex_lock(&mdev->ucontext_lock); + list_add_tail(&ucontext->dev_list, &mdev->ucontext_list); + mutex_unlock(&mdev->ucontext_lock); + return 0; } @@ -236,6 +242,10 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext *ibcontext) mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); gc = mdev_to_gc(mdev); + mutex_lock(&mdev->ucontext_lock); + list_del_init(&mana_ucontext->dev_list); + mutex_unlock(&mdev->ucontext_lock); + ret = mana_gd_destroy_doorbell_page(gc, mana_ucontext->doorbell); if (ret) ibdev_dbg(ibdev, "Failed to destroy doorbell page %d\n", ret); diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index a7c8c0fd7019..c7e333d3e9d8 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -83,6 +83,9 @@ struct mana_ib_dev { struct dma_pool *av_pool; netdevice_tracker dev_tracker; struct notifier_block nb; + /* Protects ucontext_list */ + struct mutex ucontext_lock; + struct list_head ucontext_list; }; struct mana_ib_wq { @@ -197,6 +200,9 @@ struct mana_ib_qp { struct mana_ib_ucontext { struct ib_ucontext ibucontext; u32 doorbell; + struct list_head dev_list; + /* Protects resource lists below */ + struct mutex lock; }; struct mana_ib_rwq_ind_table { -- 2.43.0
