From: Guoqing Jiang <guoqing.jiang@linux.dev>
To: bmt@zurich.ibm.com, jgg@ziepe.ca, leon@kernel.org
Cc: linux-rdma@vger.kernel.org
Subject: [PATCH V2 15/20] RDMA/siw: Cleanup siw_accept
Date: Fri, 13 Oct 2023 10:00:48 +0800 [thread overview]
Message-ID: <20231013020053.2120-16-guoqing.jiang@linux.dev> (raw)
In-Reply-To: <20231013020053.2120-1-guoqing.jiang@linux.dev>
With the initialization of rv and the two added label, we can
simplifiy code a bit.
Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
---
drivers/infiniband/sw/siw/siw_cm.c | 41 ++++++++++--------------------
1 file changed, 14 insertions(+), 27 deletions(-)
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 21303bad1281..4dbdcae46a78 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1548,7 +1548,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
struct siw_cep *cep = (struct siw_cep *)id->provider_data;
struct siw_qp *qp;
struct siw_qp_attrs qp_attrs;
- int rv, max_priv_data = MPA_MAX_PRIVDATA;
+ int rv = -EINVAL, max_priv_data = MPA_MAX_PRIVDATA;
bool wait_for_peer_rts = false;
siw_cep_set_inuse(cep);
@@ -1564,24 +1564,17 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
if (cep->state != SIW_EPSTATE_RECVD_MPAREQ) {
siw_dbg_cep(cep, "out of state\n");
-
- siw_cep_set_free_and_put(cep);
-
- return -ECONNRESET;
+ rv = -ECONNRESET;
+ goto free_cep;
}
qp = siw_qp_id2obj(sdev, params->qpn);
if (!qp) {
WARN(1, "[QP %d] does not exist\n", params->qpn);
- siw_cep_set_free_and_put(cep);
-
- return -EINVAL;
+ goto free_cep;
}
down_write(&qp->state_lock);
- if (qp->attrs.state > SIW_QP_STATE_RTR) {
- rv = -EINVAL;
- up_write(&qp->state_lock);
- goto error;
- }
+ if (qp->attrs.state > SIW_QP_STATE_RTR)
+ goto error_unlock;
siw_dbg_cep(cep, "[QP %d]\n", params->qpn);
if (try_gso && cep->mpa.hdr.params.bits & MPA_RR_FLAG_GSO_EXP) {
@@ -1595,9 +1588,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
"[QP %u]: ord %d (max %d), ird %d (max %d)\n",
qp_id(qp), params->ord, sdev->attrs.max_ord,
params->ird, sdev->attrs.max_ird);
- rv = -EINVAL;
- up_write(&qp->state_lock);
- goto error;
+ goto error_unlock;
}
if (cep->enhanced_rdma_conn_est)
max_priv_data -= sizeof(struct mpa_v2_data);
@@ -1607,9 +1598,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
cep,
"[QP %u]: private data length: %d (max %d)\n",
qp_id(qp), params->private_data_len, max_priv_data);
- rv = -EINVAL;
- up_write(&qp->state_lock);
- goto error;
+ goto error_unlock;
}
if (cep->enhanced_rdma_conn_est) {
if (params->ord > cep->ord) {
@@ -1618,9 +1607,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
} else {
cep->ird = params->ird;
cep->ord = params->ord;
- rv = -EINVAL;
- up_write(&qp->state_lock);
- goto error;
+ goto error_unlock;
}
}
if (params->ird < cep->ird) {
@@ -1629,8 +1616,7 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
params->ird = cep->ird;
else {
rv = -ENOMEM;
- up_write(&qp->state_lock);
- goto error;
+ goto error_unlock;
}
}
if (cep->mpa.v2_ctrl.ord &
@@ -1677,7 +1663,6 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
SIW_QP_ATTR_ORD | SIW_QP_ATTR_IRD |
SIW_QP_ATTR_MPA);
up_write(&qp->state_lock);
-
if (rv)
goto error;
@@ -1700,6 +1685,9 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
siw_cep_set_free(cep);
return 0;
+
+error_unlock:
+ up_write(&qp->state_lock);
error:
siw_socket_disassoc(cep->sock);
sock_release(cep->sock);
@@ -1714,9 +1702,8 @@ int siw_accept(struct iw_cm_id *id, struct iw_cm_conn_param *params)
}
cep->qp = NULL;
siw_qp_put(qp);
-
+free_cep:
siw_cep_set_free_and_put(cep);
-
return rv;
}
--
2.35.3
next prev parent reply other threads:[~2023-10-13 2:01 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 2:00 [PATCH V2 00/20] Cleanup for siw Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 01/20] RDMA/siw: Introduce siw_get_page Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 02/20] RDMA/siw: Introduce siw_srx_update_skb Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 03/20] RDMA/siw: Use iov.iov_len in kernel_sendmsg Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 04/20] RDMA/siw: Remove goto lable in siw_mmap Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 05/20] RDMA/siw: Remove rcu from siw_qp Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 06/20] RDMA/siw: No need to check term_info.valid before call siw_send_terminate Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 07/20] RDMA/siw: Also goto out_sem_up if pin_user_pages returns 0 Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 08/20] RDMA/siw: Factor out siw_generic_rx helper Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 09/20] RDMA/siw: Introduce SIW_STAG_MAX_INDEX Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 10/20] RDMA/siw: Add one parameter to siw_destroy_cpulist Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 11/20] RDMA/siw: Introduce siw_cep_set_free_and_put Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 12/20] RDMA/siw: Introduce siw_free_cm_id Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 13/20] RDMA/siw: Simplify siw_qp_id2obj Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 14/20] RDMA/siw: Simplify siw_mem_id2obj Guoqing Jiang
2023-10-13 2:00 ` Guoqing Jiang [this message]
2023-10-13 2:00 ` [PATCH V2 16/20] RDMA/siw: Remove siw_sk_assign_cm_upcalls Guoqing Jiang
2023-10-13 2:00 ` [PATCH V2 17/20] RDMA/siw: Fix typo Guoqing Jiang
2023-10-25 13:22 ` Bernard Metzler
2023-10-13 2:00 ` [PATCH V2 18/20] RDMA/siw: Only check attrs->cap.max_send_wr in siw_create_qp Guoqing Jiang
2023-10-25 13:27 ` Bernard Metzler
2023-10-26 6:55 ` Guoqing Jiang
2023-10-26 14:00 ` Bernard Metzler
2023-10-13 2:00 ` [PATCH V2 19/20] RDMA/siw: Introduce siw_destroy_cep_sock Guoqing Jiang
2023-10-25 13:28 ` Bernard Metzler
2023-10-13 2:00 ` [PATCH V2 20/20] RDMA/siw: Update comments for siw_qp_sq_process Guoqing Jiang
2023-10-25 13:29 ` Bernard Metzler
2023-10-24 14:09 ` [PATCH V2 00/20] Cleanup for siw Leon Romanovsky
2023-10-24 17:22 ` Bernard Metzler
2023-10-24 18:19 ` Leon Romanovsky
2023-10-25 13:37 ` Bernard Metzler
2023-10-26 7:02 ` Guoqing Jiang
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=20231013020053.2120-16-guoqing.jiang@linux.dev \
--to=guoqing.jiang@linux.dev \
--cc=bmt@zurich.ibm.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).