Commit 2c4d3133 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Changpeng Liu
Browse files

nvme/tcp: Support extended LBA payload in nvme_tcp_pdu_calc_data_digest 



When pdu->dif_ctx is not NULL, call spdk_dif_update_crc32_stream
to calculate crc32c instead. To improve readability, factor out
the operation to calculate crc32c when pdu->dif_ctx is NULL together.

spdk_dif_update_crc32_stream is already tested in UT for DIF library.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 8448adae

include/spdk_internal/nvme_tcp.h

+19 −5
Original line number Diff line number Diff line
@@ -165,19 +165,33 @@ nvme_tcp_pdu_calc_header_digest(struct nvme_tcp_pdu *pdu) 
	return crc32c;

}



static uint32_t

_update_crc32c_iov(struct iovec *iov, int iovcnt, uint32_t crc32c)

{

	int i;



	for (i = 0; i < iovcnt; i++) {

		assert(iov[i].iov_base != NULL);

		assert(iov[i].iov_len != 0);

		crc32c = spdk_crc32c_update(iov[i].iov_base, iov[i].iov_len, crc32c);

	}



	return crc32c;

}



static uint32_t

nvme_tcp_pdu_calc_data_digest(struct nvme_tcp_pdu *pdu)

{

	uint32_t crc32c = SPDK_CRC32C_XOR;

	uint32_t mod;

	uint32_t i;



	assert(pdu->data_len != 0);



	for (i = 0; i < pdu->data_iovcnt; i++) {

		assert(pdu->data_iov[i].iov_base != NULL);

		assert(pdu->data_iov[i].iov_len != 0);

		crc32c = spdk_crc32c_update(pdu->data_iov[i].iov_base, pdu->data_iov[i].iov_len, crc32c);

	if (spdk_likely(!pdu->dif_ctx)) {

		crc32c = _update_crc32c_iov(pdu->data_iov, pdu->data_iovcnt, crc32c);

	} else {

		spdk_dif_update_crc32c_stream(pdu->data_iov, pdu->data_iovcnt,

					      0, pdu->data_len, &crc32c, pdu->dif_ctx);

	}



	mod = pdu->data_len % SPDK_NVME_TCP_DIGEST_ALIGNMENT;