Commit 37dc93b9 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: adjust assert for zcopy req complete 



When an request using zcopy is completed, it might have an unreleased
zcopy_bdev_io attached in three cases:
 1) the request was a read,
 2) the request was a failed write,
 3) the qpair is being disconnected.

The last case was missing from the assertion.

Fixes #2425

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I5cbeaa198a1fd878c98caf148a0bc47060e35bca
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12263


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent aa212405

lib/nvmf/tcp.c

+3 −2
Original line number Diff line number Diff line
@@ -2924,10 +2924,11 @@ nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
				nvmf_tcp_control_msg_put(tgroup->control_msg_list, tcp_req->req.data);

			} else if (tcp_req->req.zcopy_bdev_io != NULL) {

				/* If the request has an unreleased zcopy bdev_io, it's either a

				 * read or a failed write */

				 * read, a failed write, or the qpair is being disconnected */

				assert(spdk_nvmf_request_using_zcopy(&tcp_req->req));

				assert(tcp_req->req.xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST ||

				       spdk_nvme_cpl_is_error(&tcp_req->req.rsp->nvme_cpl));

				       spdk_nvme_cpl_is_error(&tcp_req->req.rsp->nvme_cpl) ||

				       tqpair->qpair.state != SPDK_NVMF_QPAIR_ACTIVE);

				nvmf_tcp_req_set_state(tcp_req, TCP_REQUEST_STATE_AWAITING_ZCOPY_RELEASE);

				spdk_nvmf_request_zcopy_end(&tcp_req->req, false);

				break;