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

lib/iscsi: Refactor the code in iscsi_read_pdu.

Browse Source 
For the logic in ISCSI_PDU_RECV_STATE_AWAIT_PDU_PAYLOAD case,
this change will make it easier to read.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: Iccc582dd5c749c60b3d22b2b9b73fb8407e59b0d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6360
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2021-02-10 19:51:39 +08:00 committed by Tomasz Zawadzki
parent 9451030761
commit 36b9a670c8
1 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
lib/iscsi/iscsi.c
View File

@ -4669,72 +4669,73 @@ iscsi_read_pdu(struct spdk_iscsi_conn *conn)
break; break;
case ISCSI_PDU_RECV_STATE_AWAIT_PDU_PAYLOAD: case ISCSI_PDU_RECV_STATE_AWAIT_PDU_PAYLOAD:
data_len = pdu->data_segment_len; data_len = pdu->data_segment_len;
if (data_len != 0) {
if (data_len != 0 && pdu->data_buf == NULL) { if (pdu->data_buf == NULL) {
if (data_len <= iscsi_get_max_immediate_data_size()) { if (data_len <= iscsi_get_max_immediate_data_size()) {
pool = g_iscsi.pdu_immediate_data_pool; pool = g_iscsi.pdu_immediate_data_pool;
pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(iscsi_get_max_immediate_data_size()); pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(iscsi_get_max_immediate_data_size());
} else if (data_len <= SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH) { } else if (data_len <= SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH) {
pool = g_iscsi.pdu_data_out_pool; pool = g_iscsi.pdu_data_out_pool;
pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH); pdu->data_buf_len = SPDK_BDEV_BUF_SIZE_WITH_MD(SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH);
} 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);
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR; conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break; break;
} }
pdu->mobj = spdk_mempool_get(pool); pdu->mobj = spdk_mempool_get(pool);
if (pdu->mobj == NULL) { if (pdu->mobj == NULL) {
return 0; return 0;
} }
pdu->data_buf = pdu->mobj->buf; pdu->data_buf = pdu->mobj->buf;
pdu->data = pdu->mobj->buf; pdu->data = pdu->mobj->buf;
pdu->data_from_mempool = true; pdu->data_from_mempool = true;
}
/* copy the actual data into local buffer */
if (pdu->data_valid_bytes < data_len) {
rc = iscsi_conn_read_data_segment(conn, pdu, data_len);
if (rc < 0) {
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break;
} }
pdu->data_valid_bytes += rc; /* copy the actual data into local buffer */
if (pdu->data_valid_bytes < data_len) { if ((pdu->data_valid_bytes < data_len)) {
return 0; rc = iscsi_conn_read_data_segment(conn, pdu, data_len);
} if (rc < 0) {
} conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break;
}
/* copy out the data digest */ pdu->data_valid_bytes += rc;
if (conn->data_digest && data_len != 0 && if (pdu->data_valid_bytes < data_len) {
pdu->ddigest_valid_bytes < ISCSI_DIGEST_LEN) { return 0;
rc = iscsi_conn_read_data(conn, }
ISCSI_DIGEST_LEN - pdu->ddigest_valid_bytes,
pdu->data_digest + pdu->ddigest_valid_bytes);
if (rc < 0) {
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break;
} }
pdu->ddigest_valid_bytes += rc; /* copy out the data digest */
if (pdu->ddigest_valid_bytes < ISCSI_DIGEST_LEN) { if (conn->data_digest &&
return 0; pdu->ddigest_valid_bytes < ISCSI_DIGEST_LEN) {
rc = iscsi_conn_read_data(conn,
ISCSI_DIGEST_LEN - pdu->ddigest_valid_bytes,
pdu->data_digest + pdu->ddigest_valid_bytes);
if (rc < 0) {
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break;
}
pdu->ddigest_valid_bytes += rc;
if (pdu->ddigest_valid_bytes < ISCSI_DIGEST_LEN) {
return 0;
}
} }
}
/* All data for this PDU has now been read from the socket. */ /* All data for this PDU has now been read from the socket. */
spdk_trace_record(TRACE_ISCSI_READ_PDU, conn->id, pdu->data_valid_bytes, spdk_trace_record(TRACE_ISCSI_READ_PDU, conn->id, pdu->data_valid_bytes,
(uintptr_t)pdu, pdu->bhs.opcode); (uintptr_t)pdu, pdu->bhs.opcode);
/* check data digest */ /* check data digest */
if (conn->data_digest && data_len != 0) { if (conn->data_digest) {
crc32c = iscsi_pdu_calc_data_digest(pdu); crc32c = iscsi_pdu_calc_data_digest(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);
conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR; conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_ERROR;
break; break;
}
} }
} }