Commit 72eedc57 authored Jun 30, 2020 by Shuhei Matsumoto Committed by Tomasz Zawadzki Jul 14, 2020

nvmf/tcp: Abort request whose CID matches if it is pending



If the request is queued and is not in completing, we can abort
it safely.

If the state of the request is NEED_BUFFERING, the request is
queued to both tqpair->group->group.pending_buf_queue and
the queue per state.

If the state is AWAITING_R2T_ACK, the request is queued to the
queue per state.

Dequeueing from the queue per state is done in
nvmf_tcp_req_set_state(). Hence explicit dequeuing only when the
state of the request is NEED_BUFFERING.

Most abort operation is common between two cases. We can use fallthrough
in switch-case but factor out the common operation into a helper
function nvmf_tcp_req_set_abort_status() instead because we may use
the helper function in future and using helper function is easier to
read than fallthrough.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I1695b084d5d1f2537fbdd512bc3cd136e0f6a65b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3009


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Michael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>

parent b8a87e6a

lib/nvmf/tcp.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -2461,6 +2461,18 @@ nvmf_tcp_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,
		return nvmf_tcp_qpair_get_trid(qpair, trid, 0);
		}

		static void
		nvmf_tcp_req_set_abort_status(struct spdk_nvmf_request *req,
		struct spdk_nvmf_tcp_req *tcp_req_to_abort)
		{
		tcp_req_to_abort->req.rsp->nvme_cpl.status.sct = SPDK_NVME_SCT_GENERIC;
		tcp_req_to_abort->req.rsp->nvme_cpl.status.sc = SPDK_NVME_SC_ABORTED_BY_REQUEST;

		nvmf_tcp_req_set_state(tcp_req_to_abort, TCP_REQUEST_STATE_READY_TO_COMPLETE);

		req->rsp->nvme_cpl.cdw0 &= ~1U; /* Command was successfully aborted. */
		}

		static void
		nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
		struct spdk_nvmf_request *req)
		@@ -2494,6 +2506,18 @@ nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
		return;
		}
		break;

		case TCP_REQUEST_STATE_NEED_BUFFER:
		STAILQ_REMOVE(&tqpair->group->group.pending_buf_queue,
		&tcp_req_to_abort->req, spdk_nvmf_request, buf_link);

		nvmf_tcp_req_set_abort_status(req, tcp_req_to_abort);
		break;

		case TCP_REQUEST_STATE_AWAITING_R2T_ACK:
		nvmf_tcp_req_set_abort_status(req, tcp_req_to_abort);
		break;

		default:
		break;
		}