RDMA/rxe: Remove rxe_drop_all_macst_groups

With o10-2.2.3 enforced rxe_drop_all_mcast_groups is completely
unnecessary. Remove it and references to it.

Link: https://lore.kernel.org/r/20220127213755.31697-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_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 052beaa..af40e3c 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -40,7 +40,6 @@ void rxe_cq_disable(struct rxe_cq *cq);
 void rxe_cq_cleanup(struct rxe_pool_elem *arg);
 
 /* rxe_mcast.c */
-void rxe_drop_all_mcast_groups(struct rxe_qp *qp);
 void rxe_mc_cleanup(struct rxe_pool_elem *arg);
 int rxe_attach_mcast(struct ib_qp *ibqp, union ib_gid *mgid, u16 mlid);
 int rxe_detach_mcast(struct ib_qp *ibqp, union ib_gid *mgid, u16 mlid);

diff --git a/drivers/infiniband/sw/rxe/rxe_mcast.c b/drivers/infiniband/sw/rxe/rxe_mcast.c
index 34e3c52..39a41da 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mcast.c
+++ b/drivers/infiniband/sw/rxe/rxe_mcast.c
@@ -162,32 +162,6 @@ err1:
        return -EINVAL;
 }
 
-void rxe_drop_all_mcast_groups(struct rxe_qp *qp)
-{
-       struct rxe_mcg *grp;
-       struct rxe_mca *elem;
-
-       while (1) {
-               spin_lock_bh(&qp->grp_lock);
-               if (list_empty(&qp->grp_list)) {
-                       spin_unlock_bh(&qp->grp_lock);
-                       break;
-               }
-               elem = list_first_entry(&qp->grp_list, struct rxe_mca,
-                                       grp_list);
-               list_del(&elem->grp_list);
-               spin_unlock_bh(&qp->grp_lock);
-
-               grp = elem->grp;
-               spin_lock_bh(&grp->mcg_lock);
-               list_del(&elem->qp_list);
-               grp->num_qp--;
-               spin_unlock_bh(&grp->mcg_lock);
-               rxe_drop_ref(grp);
-               rxe_drop_ref(elem);
-       }
-}
-
 void rxe_mc_cleanup(struct rxe_pool_elem *elem)
 {
        struct rxe_mcg *grp = container_of(elem, typeof(*grp), elem);

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index 3325c24..b975a5c 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -812,8 +812,6 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
 {
        struct rxe_qp *qp = container_of(work, typeof(*qp), cleanup_work.work);
 
-       rxe_drop_all_mcast_groups(qp);
-
        if (qp->sq.queue)
                rxe_queue_cleanup(qp->sq.queue);