From: "Bernard Metzler" <BMT@zurich.ibm.com>
To: "Stefan Metzmacher" <metze@samba.org>
Cc: "linux-rdma" <linux-rdma@vger.kernel.org>
Subject: Re: [PATCH 09/31] rdma/siw: use __siw_cep_terminate_upcall() for SIW_CM_WORK_PEER_CLOSE
Date: Tue, 11 May 2021 12:00:21 +0000 [thread overview]
Message-ID: <OF6589B44D.27366A13-ON002586D2.0041F33A-002586D2.0041F33E@notes.na.collabserv.com> (raw)
In-Reply-To: <8cf78b479cca333caf82eca812d421c61675d776.1620343860.git.metze@samba.org>
-----"Stefan Metzmacher" <metze@samba.org> wrote: -----
>To: "Bernard Metzler" <bmt@zurich.ibm.com>
>From: "Stefan Metzmacher" <metze@samba.org>
>Date: 05/07/2021 01:38AM
>Cc: linux-rdma@vger.kernel.org, "Stefan Metzmacher" <metze@samba.org>
>Subject: [EXTERNAL] [PATCH 09/31] rdma/siw: use
>__siw_cep_terminate_upcall() for SIW_CM_WORK_PEER_CLOSE
>
>It's easier to have generic logic in just one place.
>
>Fixes: 6c52fdc244b5 ("rdma/siw: connection management")
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Cc: Bernard Metzler <bmt@zurich.ibm.com>
>Cc: linux-rdma@vger.kernel.org
>---
> drivers/infiniband/sw/siw/siw_cm.c | 89
>+++++++++++++++++-------------
> 1 file changed, 50 insertions(+), 39 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_cm.c
>b/drivers/infiniband/sw/siw/siw_cm.c
>index b7e7f637bd03..5338be450285 100644
>--- a/drivers/infiniband/sw/siw/siw_cm.c
>+++ b/drivers/infiniband/sw/siw/siw_cm.c
>@@ -110,26 +110,67 @@ static void siw_socket_disassoc(struct socket
>*s)
> static void __siw_cep_terminate_upcall(struct siw_cep *cep,
> int reply_status)
> {
>- if (cep->qp && cep->qp->term_info.valid)
>- siw_send_terminate(cep->qp);
>+ bool suspended = false;
this is development debugging only. please remove it.
>+
>+ if (cep->qp) {
>+ struct siw_qp *qp = cep->qp;
>+
>+ if (qp->term_info.valid)
>+ siw_send_terminate(qp);
>+
>+ if (qp->rx_stream.rx_suspend || qp->tx_ctx.tx_suspend)
>+ suspended = true;
>+ } else {
>+ suspended = true;
>+ }
This block is not needed.
>
> switch (cep->state) {
> case SIW_EPSTATE_AWAIT_MPAREP:
>+ /*
>+ * MPA reply not received, but connection drop,
>+ * or timeout.
>+ */
> siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY,
> reply_status);
> break;
>
> case SIW_EPSTATE_RDMA_MODE:
>+ /*
>+ * NOTE: IW_CM_EVENT_DISCONNECT is given just
>+ * to transition IWCM into CLOSING.
>+ */
>+ WARN(!suspended, "SIW_EPSTATE_RDMA_MODE called without
>suspended\n");
Please remove this development debugging. also below.
>+ siw_cm_upcall(cep, IW_CM_EVENT_DISCONNECT, 0);
> siw_cm_upcall(cep, IW_CM_EVENT_CLOSE, 0);
> break;
>
>+ case SIW_EPSTATE_RECVD_MPAREQ:
>+ /*
>+ * Wait for the ulp/CM to call accept/reject
>+ */
>+ siw_dbg_cep(cep, "mpa req recvd, wait for ULP\n");
>+ WARN(!suspended, "SIW_EPSTATE_RECVD_MPAREQ called without
>suspended\n");
>+ break;
>+
>+ case SIW_EPSTATE_AWAIT_MPAREQ:
>+ /*
>+ * Socket close before MPA request received.
>+ */
>+ siw_dbg_cep(cep, "no mpareq: drop listener\n");
>+ if (cep->listen_cep)
>+ siw_cep_put(cep->listen_cep);
>+ cep->listen_cep = NULL;
>+ break;
>+
> case SIW_EPSTATE_IDLE:
> case SIW_EPSTATE_LISTENING:
> case SIW_EPSTATE_CONNECTING:
>- case SIW_EPSTATE_AWAIT_MPAREQ:
>- case SIW_EPSTATE_RECVD_MPAREQ:
> case SIW_EPSTATE_CLOSED:
> default:
>+ /*
>+ * for other states there is no connection
>+ * known to the IWCM.
>+ */
> break;
> }
> }
>@@ -1077,41 +1118,11 @@ static void siw_cm_work_handler(struct
>work_struct *w)
> break;
>
> case SIW_CM_WORK_PEER_CLOSE:
>- if (cep->cm_id) {
>- if (cep->state == SIW_EPSTATE_AWAIT_MPAREP) {
>- /*
>- * MPA reply not received, but connection drop
>- */
>- siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY,
>- -ECONNRESET);
>- } else if (cep->state == SIW_EPSTATE_RDMA_MODE) {
>- /*
>- * NOTE: IW_CM_EVENT_DISCONNECT is given just
>- * to transition IWCM into CLOSING.
>- */
>- siw_cm_upcall(cep, IW_CM_EVENT_DISCONNECT, 0);
>- siw_cm_upcall(cep, IW_CM_EVENT_CLOSE, 0);
>- }
>- /*
>- * for other states there is no connection
>- * known to the IWCM.
>- */
>- } else {
>- if (cep->state == SIW_EPSTATE_RECVD_MPAREQ) {
>- /*
>- * Wait for the ulp/CM to call accept/reject
>- */
>- siw_dbg_cep(cep,
>- "mpa req recvd, wait for ULP\n");
>- } else if (cep->state == SIW_EPSTATE_AWAIT_MPAREQ) {
>- /*
>- * Socket close before MPA request received.
>- */
>- siw_dbg_cep(cep, "no mpareq: drop listener\n");
>- siw_cep_put(cep->listen_cep);
>- cep->listen_cep = NULL;
>- }
>- }
>+ /*
>+ * Peer closed the connection: TCP_CLOSE*
>+ */
>+ __siw_cep_terminate_upcall(cep, -ECONNRESET);
>+
> release_cep = 1;
> break;
>
>--
>2.25.1
>
>
next prev parent reply other threads:[~2021-05-11 12:00 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 23:36 [PATCH 00/31] rdma/siw: fix a lot of deadlocks and use after free bugs Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 01/31] rdma/siw: fix warning in siw_proc_send() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 02/31] rdma/siw: call smp_mb() after mem->stag_valid = 0 in siw_invalidate_stag() too Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 03/31] rdma/siw: remove superfluous siw_cep_put() from siw_connect() error path Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 04/31] rdma/siw: let siw_accept() deferr RDMA_MODE until EVENT_ESTABLISHED Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 05/31] rdma/siw: make use of kernel_{bind,connect,listen}() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 06/31] rdma/siw: make siw_cm_upcall() a noop without valid 'id' Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 07/31] rdma/siw: split out a __siw_cep_terminate_upcall() function Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 08/31] rdma/siw: use __siw_cep_terminate_upcall() for indirect SIW_CM_WORK_CLOSE_LLP Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 09/31] rdma/siw: use __siw_cep_terminate_upcall() for SIW_CM_WORK_PEER_CLOSE Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 10/31] rdma/siw: use __siw_cep_terminate_upcall() for SIW_CM_WORK_MPATIMEOUT Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 11/31] rdma/siw: introduce SIW_EPSTATE_ACCEPTING/REJECTING for rdma_accept/rdma_reject Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 12/31] rdma/siw: add some debugging of state and sk_state to the teardown process Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 13/31] rdma/siw: handle SIW_EPSTATE_CONNECTING in __siw_cep_terminate_upcall() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 14/31] rdma/siw: let siw_connect() set AWAIT_MPAREP before siw_send_mpareqrep() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 15/31] rdma/siw: create a temporary copy of private data Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 16/31] rdma/siw: use error and out logic at the end of siw_connect() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 17/31] rdma/siw: start mpa timer before calling siw_send_mpareqrep() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 18/31] rdma/siw: call the blocking kernel_bindconnect() just before siw_send_mpareqrep() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 19/31] rdma/siw: split out a __siw_cep_close() function Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 20/31] rdma/siw: implement non-blocking connect Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 21/31] rdma/siw: let siw_listen_address() call siw_cep_alloc() first Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 22/31] rdma/siw: let siw_listen_address() call siw_cep_set_inuse() early Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 23/31] rdma/siw: make use of __siw_cep_close() in siw_accept() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 24/31] rdma/siw: do the full disassociation of cep and qp in siw_qp_llp_close() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 25/31] rdma/siw: fix double siw_cep_put() in siw_cm_work_handler() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 26/31] rdma/siw: make use of __siw_cep_close() " Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 27/31] rdma/siw: fix the "close" logic in siw_qp_cm_drop() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 28/31] rdma/siw: make use of __siw_cep_close() " Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 29/31] rdma/siw: make use of __siw_cep_close() in siw_reject() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 30/31] rdma/siw: make use of __siw_cep_close() in siw_listen_address() Stefan Metzmacher
2021-05-06 23:36 ` [PATCH 31/31] rdma/siw: make use of __siw_cep_close() in siw_drop_listeners() Stefan Metzmacher
2021-05-07 12:08 ` [PATCH 00/31] rdma/siw: fix a lot of deadlocks and use after free bugs Bernard Metzler
2021-05-26 15:43 ` Stefan Metzmacher
2021-05-28 14:35 ` Bernard Metzler
2021-05-07 12:15 ` [PATCH 01/31] rdma/siw: fix warning in siw_proc_send() Bernard Metzler
2021-05-07 13:52 ` [PATCH 03/31] rdma/siw: remove superfluous siw_cep_put() from siw_connect() error path Bernard Metzler
2021-05-11 11:31 ` [PATCH 02/31] rdma/siw: call smp_mb() after mem->stag_valid = 0 in siw_invalidate_stag() too Bernard Metzler
2021-05-11 11:36 ` [PATCH 05/31] rdma/siw: make use of kernel_{bind,connect,listen}() Bernard Metzler
2021-05-11 11:38 ` [PATCH 04/31] rdma/siw: let siw_accept() deferr RDMA_MODE until EVENT_ESTABLISHED Bernard Metzler
2021-05-11 11:42 ` [PATCH 06/31] rdma/siw: make siw_cm_upcall() a noop without valid 'id' Bernard Metzler
2021-05-11 11:55 ` [PATCH 07/31] rdma/siw: split out a __siw_cep_terminate_upcall() function Bernard Metzler
2021-05-11 11:56 ` [PATCH 08/31] rdma/siw: use __siw_cep_terminate_upcall() for indirect SIW_CM_WORK_CLOSE_LLP Bernard Metzler
2021-05-11 12:00 ` Bernard Metzler [this message]
2021-05-11 12:01 ` [PATCH 10/31] rdma/siw: use __siw_cep_terminate_upcall() for SIW_CM_WORK_MPATIMEOUT Bernard Metzler
2021-05-11 12:03 ` [PATCH 11/31] rdma/siw: introduce SIW_EPSTATE_ACCEPTING/REJECTING for rdma_accept/rdma_reject Bernard Metzler
2021-05-11 12:07 ` [PATCH 12/31] rdma/siw: add some debugging of state and sk_state to the teardown process Bernard Metzler
2021-05-11 12:15 ` [PATCH 15/31] rdma/siw: create a temporary copy of private data Bernard Metzler
2021-05-11 12:18 ` [PATCH 16/31] rdma/siw: use error and out logic at the end of siw_connect() Bernard Metzler
2021-05-11 12:20 ` [PATCH 17/31] rdma/siw: start mpa timer before calling siw_send_mpareqrep() Bernard Metzler
2021-05-11 12:25 ` [PATCH 19/31] rdma/siw: split out a __siw_cep_close() function Bernard Metzler
2021-05-11 12:31 ` [PATCH 20/31] rdma/siw: implement non-blocking connect Bernard Metzler
2021-05-11 12:42 ` [PATCH 22/31] rdma/siw: let siw_listen_address() call siw_cep_set_inuse() early Bernard Metzler
2021-05-11 12:43 ` [PATCH 23/31] rdma/siw: make use of __siw_cep_close() in siw_accept() Bernard Metzler
2021-05-11 12:47 ` [PATCH 24/31] rdma/siw: do the full disassociation of cep and qp in siw_qp_llp_close() Bernard Metzler
2021-05-11 12:58 ` [PATCH 25/31] rdma/siw: fix double siw_cep_put() in siw_cm_work_handler() Bernard Metzler
2021-05-11 13:02 ` [PATCH 27/31] rdma/siw: fix the "close" logic in siw_qp_cm_drop() Bernard Metzler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OF6589B44D.27366A13-ON002586D2.0041F33A-002586D2.0041F33E@notes.na.collabserv.com \
--to=bmt@zurich.ibm.com \
--cc=linux-rdma@vger.kernel.org \
--cc=metze@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.