Commit 9649ee09 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

lib/nvme: rename NVME_QPAIR_DISABLED 



This variable really indicates when a qpair is
no longer connected. So NVME_QPAIR_DISCONNECTED is
actually much more accurate.

Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Ia480d94f795bb0d8f5b4eff9f2857d6fe8ea1b34
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1850


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 29630303

lib/nvme/nvme_ctrlr.c

+4 −4
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ spdk_nvme_ctrlr_connect_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme 
{

	int rc;



	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISABLED) {

	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISCONNECTED) {

		return -EISCONN;

	}
@@ -467,7 +467,7 @@ spdk_nvme_ctrlr_reconnect_io_qpair(struct spdk_nvme_qpair *qpair) 
		goto out;

	}



	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISABLED) {

	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISCONNECTED) {

		rc = 0;

		goto out;

	}
@@ -1165,9 +1165,9 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 
	/* Disable all queues before disabling the controller hardware. */

	TAILQ_FOREACH(qpair, &ctrlr->active_io_qpairs, tailq) {

		qpair->transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_LOCAL;

		nvme_qpair_set_state(qpair, NVME_QPAIR_DISABLED);

		nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

	}

	nvme_qpair_set_state(ctrlr->adminq, NVME_QPAIR_DISABLED);

	nvme_qpair_set_state(ctrlr->adminq, NVME_QPAIR_DISCONNECTED);

	nvme_qpair_complete_error_reqs(ctrlr->adminq);

	nvme_transport_qpair_abort_reqs(ctrlr->adminq, 0 /* retry */);

	ctrlr->adminq->transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_LOCAL;

lib/nvme/nvme_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ struct nvme_async_event_request { 
};



enum nvme_qpair_state {

	NVME_QPAIR_DISABLED,

	NVME_QPAIR_DISCONNECTED,

	NVME_QPAIR_CONNECTING,

	NVME_QPAIR_CONNECTED,

	NVME_QPAIR_ENABLING,

lib/nvme/nvme_poll_group.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ spdk_nvme_poll_group_add(struct spdk_nvme_poll_group *group, struct spdk_nvme_qp 
	struct spdk_nvme_transport_poll_group *tgroup;

	const struct spdk_nvme_transport *transport;



	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISABLED) {

	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISCONNECTED) {

		return -EINVAL;

	}

lib/nvme/nvme_rdma.c

+5 −5
Original line number Diff line number Diff line
@@ -330,18 +330,18 @@ nvme_rdma_qpair_process_cm_event(struct nvme_rdma_qpair *rqpair) 
			break;

		case RDMA_CM_EVENT_DISCONNECTED:

			rqpair->qpair.transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_REMOTE;

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISABLED);

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISCONNECTED);

			break;

		case RDMA_CM_EVENT_DEVICE_REMOVAL:

			rqpair->qpair.transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_LOCAL;

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISABLED);

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISCONNECTED);

			break;

		case RDMA_CM_EVENT_MULTICAST_JOIN:

		case RDMA_CM_EVENT_MULTICAST_ERROR:

			break;

		case RDMA_CM_EVENT_ADDR_CHANGE:

			rqpair->qpair.transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_LOCAL;

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISABLED);

			nvme_qpair_set_state(&rqpair->qpair, NVME_QPAIR_DISCONNECTED);

			break;

		case RDMA_CM_EVENT_TIMEWAIT_EXIT:

			break;
@@ -1631,7 +1631,7 @@ nvme_rdma_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme 
	struct nvme_rdma_ctrlr *rctrlr;

	struct nvme_rdma_cm_event_entry *entry, *tmp;



	nvme_qpair_set_state(qpair, NVME_QPAIR_DISABLED);

	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

	nvme_rdma_unregister_mem(rqpair);

	nvme_rdma_unregister_reqs(rqpair);

	nvme_rdma_unregister_rsps(rqpair);
@@ -2007,7 +2007,7 @@ nvme_rdma_qpair_process_completions(struct spdk_nvme_qpair *qpair, 
	}

	nvme_rdma_qpair_process_cm_event(rqpair);



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

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

		goto fail;

	}

lib/nvme/nvme_tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -235,12 +235,12 @@ nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ 
	struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);

	struct nvme_tcp_pdu *pdu;



	if (nvme_qpair_get_state(qpair) == NVME_QPAIR_DISABLED) {

	if (nvme_qpair_get_state(qpair) == NVME_QPAIR_DISCONNECTED) {

		/* Already disconnecting */

		return;

	}



	nvme_qpair_set_state(qpair, NVME_QPAIR_DISABLED);

	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

	spdk_sock_close(&tqpair->sock);



	/* clear the send_queue */