Commit 4bb9f44e authored by Xupeng Mingtu's avatar Xupeng Mingtu Committed by Tomasz Zawadzki
Browse files

nvme/tcp: Remove redundant io timeout check in nvme_tcp_qpair_process_completions 



For qpairs assigned to a group, the io timeout check will be performed in
nvme_tcp_poll_group_process_completions. nvme_tcp_qpair_process_completions
only needs to perform io timeout checks on io qpairs that are not assigned to a group.

Change-Id: I303670895358ca534a0fffad9d329be43db126c0
Signed-off-by: default avatarXupeng Mingtu <xupeng9@staff.sina.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25731


Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent dcb37ded

lib/nvme/nvme_tcp.c

+4 −8
Original line number Diff line number Diff line
@@ -2100,14 +2100,14 @@ nvme_tcp_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_c 
	int rc;



	if (qpair->poll_group == NULL) {

		if (qpair->ctrlr->timeout_enabled) {

			nvme_tcp_qpair_check_timeout(qpair);

		}



		rc = spdk_sock_flush(tqpair->sock);

		if (rc < 0 && errno != EAGAIN) {

			SPDK_ERRLOG("Failed to flush tqpair=%p (%d): %s\n", tqpair,

				    errno, spdk_strerror(errno));

			if (tqpair->qpair.ctrlr->timeout_enabled) {

				nvme_tcp_qpair_check_timeout(qpair);

			}



			if (nvme_qpair_get_state(qpair) == NVME_QPAIR_DISCONNECTING) {

				if (TAILQ_EMPTY(&tqpair->outstanding_reqs)) {

					nvme_transport_ctrlr_disconnect_qpair_done(qpair);
@@ -2135,10 +2135,6 @@ nvme_tcp_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_c 
		goto fail;

	}



	if (tqpair->qpair.ctrlr->timeout_enabled) {

		nvme_tcp_qpair_check_timeout(qpair);

	}



	if (spdk_unlikely(nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTING)) {

		rc = nvme_tcp_ctrlr_connect_qpair_poll(qpair->ctrlr, qpair);

		if (rc != 0 && rc != -EAGAIN) {