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

nvmf/tcp: adjust assert for zcopy req complete

Browse Source 
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: Konrad 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: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Konrad Sztyber 2022-04-14 09:14:16 +02:00 committed by Tomasz Zawadzki
parent aa21240574
commit 37dc93b9ef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nvmf/tcp.c
View File

@ -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;