> -----Original Message-----
> From: Stefan Metzmacher <metze@xxxxxxxxx>
> Sent: Wednesday, 15 June 2022 17:27
> To: Bernard Metzler <BMT@xxxxxxxxxxxxxx>; linux-rdma@xxxxxxxxxxxxxxx
> Cc: Stefan Metzmacher <metze@xxxxxxxxx>
> Subject: [EXTERNAL] [PATCH v2 03/14] rdma/siw: split out a
> __siw_cep_terminate_upcall() function
>
> There are multiple places where should have the same logic.
> Having one helper function to be used in all places
> makes it easier to extended the logic.
>
> 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 | 53 ++++++++++++++++++------------
> 1 file changed, 32 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/infiniband/sw/siw/siw_cm.c
> b/drivers/infiniband/sw/siw/siw_cm.c
> index eeb366edba2a..c5ef5de7e84c 100644
> --- a/drivers/infiniband/sw/siw/siw_cm.c
> +++ b/drivers/infiniband/sw/siw/siw_cm.c
> @@ -103,6 +103,37 @@ static void siw_socket_disassoc(struct socket *s)
> }
> }
>
> +/*
> + * The caller needs to deal with siw_cep_set_inuse()
> + * and siw_cep_set_free()
> + */
> +static void __siw_cep_terminate_upcall(struct siw_cep *cep,
> + int reply_status)
Following current naming conventions, don't use
'__' in the name of that type of function.
> +{
> + if (cep->qp && cep->qp->term_info.valid)
> + siw_send_terminate(cep->qp);
> +
> + switch (cep->state) {
> + case SIW_EPSTATE_AWAIT_MPAREP:
> + siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY,
> + reply_status);
> + break;
> +
> + case SIW_EPSTATE_RDMA_MODE:
> + siw_cm_upcall(cep, IW_CM_EVENT_CLOSE, 0);
> + 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:
> + break;
> + }
> +}
> +
> static void siw_rtr_data_ready(struct sock *sk)
> {
> struct siw_cep *cep;
> @@ -393,29 +424,9 @@ void siw_qp_cm_drop(struct siw_qp *qp, int schedule)
> }
> siw_dbg_cep(cep, "immediate close, state %d\n", cep->state);
>
> - if (qp->term_info.valid)
> - siw_send_terminate(qp);
> + __siw_cep_terminate_upcall(cep, -EINVAL);
>
> if (cep->cm_id) {
> - switch (cep->state) {
> - case SIW_EPSTATE_AWAIT_MPAREP:
> - siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY,
> - -EINVAL);
> - break;
> -
> - case SIW_EPSTATE_RDMA_MODE:
> - siw_cm_upcall(cep, IW_CM_EVENT_CLOSE, 0);
> - 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:
> - break;
> - }
> cep->cm_id->rem_ref(cep->cm_id);
> cep->cm_id = NULL;
> siw_cep_put(cep);
> --
> 2.34.1
