Commit 7a4d6af1 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvmf/tcp: Stay in AWAIT_PDU_READY state until atleast 1 byte arrives 



This doesn't fix any bug, but it makes more sense to leave the qpair
in the NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY state until it
receives at least one byte.

Change-Id: Ic5f34a733a80b58f65a1334fae7e07dbded2b3d0
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/441811


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent c796c547

lib/nvmf/tcp.c

+15 −16
Original line number Diff line number Diff line
@@ -1228,6 +1228,7 @@ spdk_nvmf_tcp_qpair_set_recv_state(struct spdk_nvmf_tcp_qpair *tqpair, 


	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "tqpair(%p) recv state=%d\n", tqpair, state);

	tqpair->recv_state = state;



	switch (state) {

	case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH:

	case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_PSH:
@@ -1879,27 +1880,25 @@ spdk_nvmf_tcp_sock_process(struct spdk_nvmf_tcp_qpair *tqpair) 
		SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "tqpair(%p) recv pdu entering state %d\n", tqpair, prev_state);



		switch (tqpair->recv_state) {

		/* If in a new state */

		case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY:

			spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH);

			break;

		/* Wait for the common header  */

		case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_READY:

		case NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH:

			pdu = &tqpair->pdu_in_progress;

			/* common header */

			if (pdu->ch_valid_bytes < sizeof(struct spdk_nvme_tcp_common_pdu_hdr)) {



			rc = nvme_tcp_read_data(tqpair->sock,

						sizeof(struct spdk_nvme_tcp_common_pdu_hdr) - pdu->ch_valid_bytes,

						(void *)&pdu->hdr.common + pdu->ch_valid_bytes);

			if (rc < 0) {

				SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "will disconnect tqpair=%p\n", tqpair);

				return NVME_TCP_PDU_FATAL;

				}

			} else if (rc > 0) {

				pdu->ch_valid_bytes += rc;

				spdk_nvmf_tcp_qpair_set_recv_state(tqpair, NVME_TCP_PDU_RECV_STATE_AWAIT_PDU_CH);

			}



			if (pdu->ch_valid_bytes < sizeof(struct spdk_nvme_tcp_common_pdu_hdr)) {

				return NVME_TCP_PDU_IN_PROGRESS;

			}

			}



			/* The command header of this PDU has now been read from the socket. */

			spdk_nvmf_tcp_pdu_ch_handle(tqpair);