Re: [PATCH 27/31] rdma/siw: fix the "close" logic in siw_qp_cm_drop()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



-----"Stefan Metzmacher" <metze@xxxxxxxxx> wrote: -----

>To: "Bernard Metzler" <bmt@xxxxxxxxxxxxxx>
>From: "Stefan Metzmacher" <metze@xxxxxxxxx>
>Date: 05/07/2021 01:40AM
>Cc: linux-rdma@xxxxxxxxxxxxxxx, "Stefan Metzmacher" <metze@xxxxxxxxx>
>Subject: [EXTERNAL] [PATCH 27/31] rdma/siw: fix the "close" logic in
>siw_qp_cm_drop()
>
>cep->cm_id->rem_ref(cep->cm_id) is no reason to call
>siw_cep_put(cep), we never call siw_cep_get(cep) when
>calling id->add_ref(id).
>
>But the cep->qp cleanup needs to drop both references!
>
>Fixes: 6c52fdc244b5 ("rdma/siw: connection management")
>Signed-off-by: Stefan Metzmacher <metze@xxxxxxxxx>
>Cc: Bernard Metzler <bmt@xxxxxxxxxxxxxx>
>Cc: linux-rdma@xxxxxxxxxxxxxxx
>---
> drivers/infiniband/sw/siw/siw_cm.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_cm.c
>b/drivers/infiniband/sw/siw/siw_cm.c
>index 3dc80c21ac60..9f9750237e75 100644
>--- a/drivers/infiniband/sw/siw/siw_cm.c
>+++ b/drivers/infiniband/sw/siw/siw_cm.c
>@@ -546,7 +546,6 @@ void siw_qp_cm_drop(struct siw_qp *qp, int
>schedule)
> 		if (cep->cm_id) {
> 			cep->cm_id->rem_ref(cep->cm_id);
> 			cep->cm_id = NULL;
>-			siw_cep_put(cep);
> 		}
> 		cep->state = SIW_EPSTATE_CLOSED;
> 
>@@ -559,8 +558,11 @@ void siw_qp_cm_drop(struct siw_qp *qp, int
>schedule)
> 			cep->sock = NULL;
> 		}
> 		if (cep->qp) {
>+			BUG_ON(cep->qp->cep != cep);

Please no BUG() and friends

>+			cep->qp->cep = NULL;

That pointer should be handled by the qp code

>+			siw_qp_put(cep->qp);
> 			cep->qp = NULL;
>-			siw_qp_put(qp);
>+			siw_cep_put(cep);
> 		}
> out:
> 		siw_cep_set_free(cep);
>-- 
>2.25.1
>
>





[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Yosemite Photos]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux