RDMA/rxe: Move mw cleanup code to rxe_mw_cleanup()

Move code from rxe_dealloc_mw() to rxe_mw_cleanup() to allow flows which
hold a reference to mw to complete.

Link: https://lore.kernel.org/r/20220421014042.26985-7-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_mw.c b/drivers/infiniband/sw/rxe/rxe_mw.c
index f29829e..2e1fa84 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mw.c
+++ b/drivers/infiniband/sw/rxe/rxe_mw.c
@@ -36,40 +36,11 @@ int rxe_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata)
        return 0;
 }
 
-static void rxe_do_dealloc_mw(struct rxe_mw *mw)
-{
-       if (mw->mr) {
-               struct rxe_mr *mr = mw->mr;
-
-               mw->mr = NULL;
-               atomic_dec(&mr->num_mw);
-               rxe_put(mr);
-       }
-
-       if (mw->qp) {
-               struct rxe_qp *qp = mw->qp;
-
-               mw->qp = NULL;
-               rxe_put(qp);
-       }
-
-       mw->access = 0;
-       mw->addr = 0;
-       mw->length = 0;
-       mw->state = RXE_MW_STATE_INVALID;
-}
-
 int rxe_dealloc_mw(struct ib_mw *ibmw)
 {
        struct rxe_mw *mw = to_rmw(ibmw);
-       struct rxe_pd *pd = to_rpd(ibmw->pd);
-
-       spin_lock_bh(&mw->lock);
-       rxe_do_dealloc_mw(mw);
-       spin_unlock_bh(&mw->lock);
 
        rxe_put(mw);
-       rxe_put(pd);
 
        return 0;
 }
@@ -336,3 +307,31 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey)
 
        return mw;
 }
+
+void rxe_mw_cleanup(struct rxe_pool_elem *elem)
+{
+       struct rxe_mw *mw = container_of(elem, typeof(*mw), elem);
+       struct rxe_pd *pd = to_rpd(mw->ibmw.pd);
+
+       rxe_put(pd);
+
+       if (mw->mr) {
+               struct rxe_mr *mr = mw->mr;
+
+               mw->mr = NULL;
+               atomic_dec(&mr->num_mw);
+               rxe_put(mr);
+       }
+
+       if (mw->qp) {
+               struct rxe_qp *qp = mw->qp;
+
+               mw->qp = NULL;
+               rxe_put(qp);
+       }
+
+       mw->access = 0;
+       mw->addr = 0;
+       mw->length = 0;
+       mw->state = RXE_MW_STATE_INVALID;
+}

diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
index 8e6c4df..19b1482 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_pool.c
+++ b/drivers/infiniband/sw/rxe/rxe_pool.c
@@ -81,6 +81,7 @@ static const struct rxe_type_info {
                .name           = "mw",
                .size           = sizeof(struct rxe_mw),
                .elem_offset    = offsetof(struct rxe_mw, elem),
+               .cleanup        = rxe_mw_cleanup,
                .min_index      = RXE_MIN_MW_INDEX,
                .max_index      = RXE_MAX_MW_INDEX,
                .max_elem       = RXE_MAX_MW_INDEX - RXE_MIN_MW_INDEX + 1,