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

nvme: save last transport_failure_reason in transport 



If a reconnect fails, we restore the original
transport_failure_reason after we're done with
the failed reconnect.  Save the original reason
in the qpair itself rather than a local variable,
to facilitate upcoming changes where connect will
be asynchronous.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I20ff43fc687a379aa5c930e17cf3ff8d730320be
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8116


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 43b48832

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ struct spdk_nvme_qpair { 
	const struct spdk_nvme_transport	*transport;



	uint8_t					transport_failure_reason: 2;

	uint8_t					last_transport_failure_reason: 2;

};



struct spdk_nvme_poll_group {

lib/nvme/nvme_transport.c

+2 −3
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ int 
nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

	const struct spdk_nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring);

	uint8_t transport_failure_reason;

	int rc;



	assert(transport != NULL);
@@ -355,7 +354,7 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv 
		qpair->transport = transport;

	}



	transport_failure_reason = qpair->transport_failure_reason;

	qpair->last_transport_failure_reason = qpair->transport_failure_reason;

	qpair->transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_NONE;



	nvme_qpair_set_state(qpair, NVME_QPAIR_CONNECTING);
@@ -376,7 +375,7 @@ nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nv 


err:

	/* If the qpair was unable to reconnect, restore the original failure reason. */

	qpair->transport_failure_reason = transport_failure_reason;

	qpair->transport_failure_reason = qpair->last_transport_failure_reason;

	nvme_transport_ctrlr_disconnect_qpair(ctrlr, qpair);

	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

	return rc;