Commit e9be9df4 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvmf/tcp: Fix the potential issue of connection construction. 



When we use async writev (e.g., lib io_uring), we find that
the callback of writev is executed after recving the new
data from the initiator, and this is possible.

For example, if the NVMe-oF TCP target receives the ic_req from the
initiator, and sendout the ic_resp, the state  of tqpair will change from
invalid to running until the callback is executed. And the data of ic_resp
is already sent to the initiator, and we receive the new command later. However,
we may still not get the call back function executed
(i.e, spdk_nvmf_tcp_send_icresp_complete). And it is possible
for using lib io_uring, I faced this issue when using lib uring.

And this patch can fix this issue.

Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: I7f4332522866d475e106ac6d36a8ec715133f0dc
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472770


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 921c378d

include/spdk_internal/nvme_tcp.h

+4 −3
Original line number Diff line number Diff line
@@ -153,9 +153,10 @@ enum nvme_tcp_error_codes { 


enum nvme_tcp_qpair_state {

	NVME_TCP_QPAIR_STATE_INVALID = 0,

	NVME_TCP_QPAIR_STATE_RUNNING = 1,

	NVME_TCP_QPAIR_STATE_EXITING = 2,

	NVME_TCP_QPAIR_STATE_EXITED = 3,

	NVME_TCP_QPAIR_STATE_INITIALIZING = 1,

	NVME_TCP_QPAIR_STATE_RUNNING = 2,

	NVME_TCP_QPAIR_STATE_EXITING = 3,

	NVME_TCP_QPAIR_STATE_EXITED = 4,

};



static uint32_t

lib/nvmf/tcp.c

+5 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,7 @@ spdk_nvmf_tcp_icreq_handle(struct spdk_nvmf_tcp_transport *ttransport, 
	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "host_hdgst_enable: %u\n", tqpair->host_hdgst_enable);

	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "host_ddgst_enable: %u\n", tqpair->host_ddgst_enable);



	tqpair->state = NVME_TCP_QPAIR_STATE_INITIALIZING;

	spdk_nvmf_tcp_qpair_write_pdu(tqpair, rsp_pdu, spdk_nvmf_tcp_send_icresp_complete, tqpair);

	spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY);

	return;
@@ -2011,6 +2012,10 @@ spdk_nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) 
		/* Wait for the common header  */

		case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY:

		case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH:

			if (spdk_unlikely(tqpair->state == NVME_TCP_QPAIR_STATE_INITIALIZING)) {

				return rc;

			}



			if (!tqpair->pdu_recv_buf.remain_size) {

				rc = nvme_tcp_recv_buf_read(tqpair->sock, &tqpair->pdu_recv_buf);

				if (rc <= 0) {