Commit 0bee1bb6 authored Nov 23, 2020 by Alexey Marchuk Committed by Tomasz Zawadzki Dec 31, 2020

nvmf: Fix search for request to abort



Transport specific request to abort is never null,
if we don't find a request by cid then we will abort the
last request.

Change-Id: Ie9eb55822b47381ae254e19266b9f3ffadbb67ea
Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5196


Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 959cfa0f

lib/nvmf/rdma.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -4240,10 +4240,9 @@ nvmf_rdma_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
		cid = req->cmd->nvme_cmd.cdw10_bits.abort.cid;

		for (i = 0; i < rqpair->max_queue_depth; i++) {
		if (rqpair->resources->reqs[i].state != RDMA_REQUEST_STATE_FREE &&
		rqpair->resources->reqs[i].req.cmd->nvme_cmd.cid == cid) {
		rdma_req_to_abort = &rqpair->resources->reqs[i];

		if (rdma_req_to_abort->state != RDMA_REQUEST_STATE_FREE &&
		rdma_req_to_abort->req.cmd->nvme_cmd.cid == cid) {
		break;
		}
		}

lib/nvmf/tcp.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2717,10 +2717,9 @@ nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
		cid = req->cmd->nvme_cmd.cdw10_bits.abort.cid;

		for (i = 0; i < tqpair->resource_count; i++) {
		if (tqpair->reqs[i].state != TCP_REQUEST_STATE_FREE &&
		tqpair->reqs[i].req.cmd->nvme_cmd.cid == cid) {
		tcp_req_to_abort = &tqpair->reqs[i];

		if (tcp_req_to_abort->state != TCP_REQUEST_STATE_FREE &&
		tcp_req_to_abort->req.cmd->nvme_cmd.cid == cid) {
		break;
		}
		}