ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi: Consolidate error paths in spdk_iscsi_read_pdu

Browse Source 
spdk_iscsi_read_pdu() returns three return values,
SPDK_ISCSI_CONNECTION_FATAL, 0, or 1.

Consolidating error paths clarifies the logic.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I66a734f37bfd3bbd0ae0974813086b24cb3cd432
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456769
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-06-04 16:41:03 +09:00 committed by Darek Stojaczyk
parent 75a51ef0ca
commit 0f5314eb05
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/iscsi/iscsi.c
View File

@ -422,10 +422,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
ISCSI_BHS_LEN - pdu->bhs_valid_bytes, ISCSI_BHS_LEN - pdu->bhs_valid_bytes,
(uint8_t *)&pdu->bhs + pdu->bhs_valid_bytes); (uint8_t *)&pdu->bhs + pdu->bhs_valid_bytes);
if (rc < 0) { if (rc < 0) {
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return rc;
} }
pdu->bhs_valid_bytes += rc; pdu->bhs_valid_bytes += rc;
if (pdu->bhs_valid_bytes < ISCSI_BHS_LEN) { if (pdu->bhs_valid_bytes < ISCSI_BHS_LEN) {
@ -444,10 +441,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
ahs_len - pdu->ahs_valid_bytes, ahs_len - pdu->ahs_valid_bytes,
pdu->ahs + pdu->ahs_valid_bytes); pdu->ahs + pdu->ahs_valid_bytes);
if (rc < 0) { if (rc < 0) {
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return rc;
} }
pdu->ahs_valid_bytes += rc; pdu->ahs_valid_bytes += rc;
@ -464,10 +458,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
ISCSI_DIGEST_LEN - pdu->hdigest_valid_bytes, ISCSI_DIGEST_LEN - pdu->hdigest_valid_bytes,
pdu->header_digest + pdu->hdigest_valid_bytes); pdu->header_digest + pdu->hdigest_valid_bytes);
if (rc < 0) { if (rc < 0) {
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return rc;
} }
pdu->hdigest_valid_bytes += rc; pdu->hdigest_valid_bytes += rc;
@ -489,10 +480,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
} else { } else {
SPDK_ERRLOG("Data(%d) > MaxSegment(%d)\n", SPDK_ERRLOG("Data(%d) > MaxSegment(%d)\n",
data_len, SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH); data_len, SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH);
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return SPDK_ISCSI_CONNECTION_FATAL;
} }
pdu->mobj = spdk_mempool_get(pool); pdu->mobj = spdk_mempool_get(pool);
if (pdu->mobj == NULL) { if (pdu->mobj == NULL) {
@ -504,10 +492,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
rc = iscsi_conn_read_data_segment(conn, pdu, data_len); rc = iscsi_conn_read_data_segment(conn, pdu, data_len);
if (rc < 0) { if (rc < 0) {
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return rc;
} }
pdu->data_valid_bytes += rc; pdu->data_valid_bytes += rc;
@ -524,10 +509,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
ISCSI_DIGEST_LEN - pdu->ddigest_valid_bytes, ISCSI_DIGEST_LEN - pdu->ddigest_valid_bytes,
pdu->data_digest + pdu->ddigest_valid_bytes); pdu->data_digest + pdu->ddigest_valid_bytes);
if (rc < 0) { if (rc < 0) {
*_pdu = NULL; goto error;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return rc;
} }
pdu->ddigest_valid_bytes += rc; pdu->ddigest_valid_bytes += rc;
@ -547,16 +529,18 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
if (data_len != 0) { if (data_len != 0) {
if (!iscsi_check_data_segment_length(conn, pdu, data_len)) { if (!iscsi_check_data_segment_length(conn, pdu, data_len)) {
rc = iscsi_reject(conn, pdu, ISCSI_REASON_PROTOCOL_ERROR); rc = iscsi_reject(conn, pdu, ISCSI_REASON_PROTOCOL_ERROR);
spdk_put_pdu(pdu);
/* /*
* If spdk_iscsi_reject() was not able to reject the PDU, * If spdk_iscsi_reject() was not able to reject the PDU,
* treat it as a fatal connection error. Otherwise, * treat it as a fatal connection error. Otherwise,
* return SUCCESS here so that the caller will continue * return SUCCESS here so that the caller will continue
* to attempt to read PDUs. * to attempt to read PDUs.
*/ */
rc = (rc < 0) ? SPDK_ISCSI_CONNECTION_FATAL : SPDK_SUCCESS; if (rc == 0) {
return rc; spdk_put_pdu(pdu);
return SPDK_SUCCESS;
} else {
goto error;
}
} }
pdu->data = pdu->data_buf; pdu->data = pdu->data_buf;
@ -570,8 +554,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
rc = MATCH_DIGEST_WORD(pdu->header_digest, crc32c); rc = MATCH_DIGEST_WORD(pdu->header_digest, crc32c);
if (rc == 0) { if (rc == 0) {
SPDK_ERRLOG("header digest error (%s)\n", conn->initiator_name); SPDK_ERRLOG("header digest error (%s)\n", conn->initiator_name);
spdk_put_pdu(pdu); goto error;
return SPDK_ISCSI_CONNECTION_FATAL;
} }
} }
if (conn->data_digest && data_len != 0) { if (conn->data_digest && data_len != 0) {
@ -579,13 +562,18 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)
rc = MATCH_DIGEST_WORD(pdu->data_digest, crc32c); rc = MATCH_DIGEST_WORD(pdu->data_digest, crc32c);
if (rc == 0) { if (rc == 0) {
SPDK_ERRLOG("data digest error (%s)\n", conn->initiator_name); SPDK_ERRLOG("data digest error (%s)\n", conn->initiator_name);
spdk_put_pdu(pdu); goto error;
return SPDK_ISCSI_CONNECTION_FATAL;
} }
} }
*_pdu = pdu; *_pdu = pdu;
return 1; return 1;
error:
*_pdu = NULL;
spdk_put_pdu(pdu);
conn->pdu_in_progress = NULL;
return SPDK_ISCSI_CONNECTION_FATAL;
} }
struct _iscsi_sgl { struct _iscsi_sgl {