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

nvmf/tcp: eliminate function nvmf_tcp_set_in_capsule_data

Browse Source 
This function is small and called only once.

Signed-off-by: MengjinWu <mengjin.wu@intel.com>
Change-Id: Ie4b11668e42a8920b3a9a11aa8cb83512f32942c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14576
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
MengjinWu 2022-09-21 16:32:13 +00:00 committed by Tomasz Zawadzki
parent b5aeff1dba
commit f8dd380b33
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/nvmf/tcp.c
View File

@ -2555,25 +2555,6 @@ request_transfer_out(struct spdk_nvmf_request *req)
return 0; return 0;
} }
static void
nvmf_tcp_set_in_capsule_data(struct spdk_nvmf_tcp_qpair *tqpair,
struct spdk_nvmf_tcp_req *tcp_req)
{
struct nvme_tcp_pdu *pdu;
uint32_t plen = 0;
pdu = tqpair->pdu_in_progress;
plen = pdu->hdr.common.hlen;
if (tqpair->host_hdgst_enable) {
plen += SPDK_NVME_TCP_DIGEST_LEN;
}
if (pdu->hdr.common.plen != plen) {
tcp_req->has_in_capsule_data = true;
}
}
static void static void
nvmf_tcp_check_fused_ordering(struct spdk_nvmf_tcp_transport *ttransport, nvmf_tcp_check_fused_ordering(struct spdk_nvmf_tcp_transport *ttransport,
struct spdk_nvmf_tcp_qpair *tqpair, struct spdk_nvmf_tcp_qpair *tqpair,
@ -2632,6 +2613,8 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport,
{ {
struct spdk_nvmf_tcp_qpair *tqpair; struct spdk_nvmf_tcp_qpair *tqpair;
int rc; int rc;
uint32_t plen;
struct nvme_tcp_pdu *pdu;
enum spdk_nvmf_tcp_req_state prev_state; enum spdk_nvmf_tcp_req_state prev_state;
bool progress = false; bool progress = false;
struct spdk_nvmf_transport *transport = &ttransport->transport; struct spdk_nvmf_transport *transport = &ttransport->transport;
@ -2696,9 +2679,15 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport,
break; break;
} }
nvmf_tcp_set_in_capsule_data(tqpair, tcp_req); pdu = tqpair->pdu_in_progress;
plen = pdu->hdr.common.hlen;
if (!tcp_req->has_in_capsule_data) { if (tqpair->host_hdgst_enable) {
plen += SPDK_NVME_TCP_DIGEST_LEN;
}
if (pdu->hdr.common.plen != plen) {
tcp_req->has_in_capsule_data = true;
} else {
/* Data is transmitted by C2H PDUs */
nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY); nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY);
} }