RDMA/rxe: Move mr cleanup code to rxe_mr_cleanup()

Move the code which tears down an mr to rxe_mr_cleanup to allow operations
holding a reference to the mr to complete.

Link: https://lore.kernel.org/r/20220421014042.26985-6-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_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index 60a31b7..fc3942e 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -683,14 +683,10 @@ int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)
 {
        struct rxe_mr *mr = to_rmr(ibmr);
 
-       if (atomic_read(&mr->num_mw) > 0) {
-               pr_warn("%s: Attempt to deregister an MR while bound to MWs\n",
-                       __func__);
+       /* See IBA 10.6.7.2.6 */
+       if (atomic_read(&mr->num_mw) > 0)
                return -EINVAL;
-       }
 
-       mr->state = RXE_MR_STATE_INVALID;
-       rxe_put(mr_pd(mr));
        rxe_put(mr);
 
        return 0;
@@ -700,6 +696,8 @@ void rxe_mr_cleanup(struct rxe_pool_elem *elem)
 {
        struct rxe_mr *mr = container_of(elem, typeof(*mr), elem);
 
+       rxe_put(mr_pd(mr));
+
        ib_umem_release(mr->umem);
 
        if (mr->cur_map_set)