From 00005ed8d5a1c035dfc6efd46676569e34fca83d Mon Sep 17 00:00:00 2001 From: MengjinWu Date: Tue, 20 Sep 2022 11:21:47 +0000 Subject: [PATCH] nvmf/tcp: eliminate function 'nvmf_tcp_pdu_payload_insert_dif' This function is called only once and can be eliminated. Signed-off-by: MengjinWu Change-Id: I0b3e80c025b60a816e2113f859907f95e96dd183 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14578 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- lib/nvmf/tcp.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 9cec0d40e..49febb187 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -2097,21 +2097,6 @@ err: nvmf_tcp_send_c2h_term_req(tqpair, pdu, fes, error_offset); } -static int -nvmf_tcp_pdu_payload_insert_dif(struct nvme_tcp_pdu *pdu, uint32_t read_offset, - int read_len) -{ - int rc; - - rc = spdk_dif_generate_stream(pdu->data_iov, pdu->data_iovcnt, - read_offset, read_len, pdu->dif_ctx); - if (rc != 0) { - SPDK_ERRLOG("DIF generate failed\n"); - } - - return rc; -} - static int nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) { @@ -2213,11 +2198,12 @@ nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) return NVME_TCP_PDU_IN_PROGRESS; } - if (spdk_unlikely(pdu->dif_ctx != NULL)) { - rc = nvmf_tcp_pdu_payload_insert_dif(pdu, 0, data_len); - if (rc != 0) { - return NVME_TCP_PDU_FATAL; - } + /* Generate and insert DIF to whole data block received if DIF is enabled */ + if (spdk_unlikely(pdu->dif_ctx != NULL) && + spdk_dif_generate_stream(pdu->data_iov, pdu->data_iovcnt, 0, data_len, + pdu->dif_ctx) != 0) { + SPDK_ERRLOG("DIF generate failed\n"); + return NVME_TCP_PDU_FATAL; } /* All of this PDU has now been read from the socket. */