mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

RDMA/rxe: Collect cleanup mca code in a subroutine

Browse source 
Collect cleanup code for struct rxe_mca into a subroutine,
__rxe_cleanup_mca() called in rxe_detach_mcg() in rxe_mcast.c.

Link: https://lore.kernel.org/r/20220223230706.50332-4-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Bob Pearson 2022-02-23 17:07:05 -06:00 committed by Jason Gunthorpe
parent 4a4f107347
commit a181c4c81a
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/infiniband/sw/rxe/rxe_mcast.c
View file

@ -339,13 +339,31 @@ static int rxe_attach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
return err;
}
/**
* __rxe_cleanup_mca - cleanup mca object holding lock
* @mca: mca object
* @mcg: mcg object
*
* Context: caller must hold a reference to mcg and rxe->mcg_lock
*/
static void __rxe_cleanup_mca(struct rxe_mca *mca, struct rxe_mcg *mcg)
{
list_del(&mca->qp_list);
atomic_dec(&mcg->qp_num);
atomic_dec(&mcg->rxe->mcg_attach);
atomic_dec(&mca->qp->mcg_num);
rxe_drop_ref(mca->qp);
kfree(mca);
}
static int rxe_detach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
union ib_gid *mgid)
{
struct rxe_mcg *mcg;
struct rxe_mca *mca, *tmp;
unsigned long flags;
int err;
mcg = rxe_lookup_mcg(rxe, mgid);
if (!mcg)
@ -354,37 +372,30 @@ static int rxe_detach_mcg(struct rxe_dev *rxe, struct rxe_qp *qp,
spin_lock_irqsave(&rxe->mcg_lock, flags);
list_for_each_entry_safe(mca, tmp, &mcg->qp_list, qp_list) {
if (mca->qp == qp) {
list_del(&mca->qp_list);
atomic_dec(&qp->mcg_num);
atomic_dec(&rxe->mcg_attach);
rxe_drop_ref(qp);
__rxe_cleanup_mca(mca, mcg);
/* if the number of qp's attached to the
* mcast group falls to zero go ahead and
* tear it down. This will not free the
* object since we are still holding a ref
* from the get key above.
* from the get key above
*/
if (atomic_dec_return(&mcg->qp_num) <= 0)
if (atomic_read(&mcg->qp_num) <= 0)
__rxe_destroy_mcg(mcg);
/* drop the ref from get key. This will free the
* object if qp_num is zero.
*/
kref_put(&mcg->ref_cnt, rxe_cleanup_mcg);
kfree(mca);
err = 0;
goto out_unlock;
spin_unlock_irqrestore(&rxe->mcg_lock, flags);
return 0;
}
}
/* we didn't find the qp on the list */
kref_put(&mcg->ref_cnt, rxe_cleanup_mcg);
err = -EINVAL;
out_unlock:
spin_unlock_irqrestore(&rxe->mcg_lock, flags);
return err;
return -EINVAL;
}
int rxe_attach_mcast(struct ib_qp *ibqp, union ib_gid *mgid, u16 mlid)