Commit 9d4ee5f3 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Darek Stojaczyk
Browse files

nvmf/tcp: Fix wrong data offset in nvmf_tcp_pdu_payload_insert_dif 



We updated readv_offset before generating DIF to avoid adding
the temporary variable _rc in the previous patch, but that caused
write error when inserting DIF.

Fix the bug in this patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Id0788280a83cbea2554c851db77751432fc00cba
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461116


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 2c9b0af2

lib/nvmf/tcp.c

+4 −3
Original line number Diff line number Diff line
@@ -1859,12 +1859,13 @@ err: 
}



static int

nvmf_tcp_pdu_payload_insert_dif(struct nvme_tcp_pdu *pdu, int read_len)

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,

				      pdu->readv_offset, read_len, pdu->dif_ctx);

				      read_offset, read_len, pdu->dif_ctx);

	if (rc != 0) {

		SPDK_ERRLOG("DIF generate failed\n");

	}
@@ -1985,7 +1986,7 @@ spdk_nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) 
			pdu->readv_offset += rc;



			if (spdk_unlikely(pdu->dif_ctx != NULL)) {

				rc = nvmf_tcp_pdu_payload_insert_dif(pdu, rc);

				rc = nvmf_tcp_pdu_payload_insert_dif(pdu, pdu->readv_offset - rc, rc);

				if (rc != 0) {

					return NVME_TCP_PDU_FATAL;

				}