Commit 61537a19 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

nvme: replace nvme_qpair_state_equals. 



nvme_qpair_get_state fits more closely with the semantics in other
modules.

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


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>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
parent 24bca2ea

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ spdk_nvme_ctrlr_reconnect_io_qpair(struct spdk_nvme_qpair *qpair) 
		goto out;

	}



	if (!nvme_qpair_state_equals(qpair, NVME_QPAIR_DISABLED)) {

	if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISABLED) {

		rc = 0;

		goto out;

	}

lib/nvme/nvme_internal.h

+3 −4
Original line number Diff line number Diff line
@@ -994,10 +994,9 @@ nvme_qpair_set_state(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state) 
	qpair->state = state;

}



static inline bool

nvme_qpair_state_equals(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state)

{

	return qpair->state == state;

static inline enum nvme_qpair_state

nvme_qpair_get_state(struct spdk_nvme_qpair *qpair) {

	return qpair->state;

}



static inline void

lib/nvme/nvme_qpair.c

+5 −5
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ nvme_qpair_check_enabled(struct spdk_nvme_qpair *qpair) 
	 * from the old transport connection and encourage the application to retry them. We also need

	 * to submit any queued requests that built up while we were in the connected or enabling state.

	 */

	if (nvme_qpair_state_equals(qpair, NVME_QPAIR_CONNECTED) && !qpair->ctrlr->is_resetting) {

	if (nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTED && !qpair->ctrlr->is_resetting) {

		nvme_qpair_set_state(qpair, NVME_QPAIR_ENABLING);

		nvme_qpair_complete_error_reqs(qpair);

		nvme_transport_qpair_abort_reqs(qpair, 0 /* retry */);
@@ -430,7 +430,7 @@ nvme_qpair_check_enabled(struct spdk_nvme_qpair *qpair) 
		}

	}



	return nvme_qpair_state_equals(qpair, NVME_QPAIR_ENABLED);

	return nvme_qpair_get_state(qpair) == NVME_QPAIR_ENABLED;

}



int32_t
@@ -449,7 +449,7 @@ spdk_nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_ 
	}



	if (spdk_unlikely(!nvme_qpair_check_enabled(qpair) &&

			  !nvme_qpair_state_equals(qpair, NVME_QPAIR_CONNECTING))) {

			  !(nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTING))) {

		/*

		 * qpair is not enabled, likely because a controller reset is

		 *  in progress.
@@ -667,9 +667,9 @@ _nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *r 
	 * 2. Always allow fabrics commands through - these get

	 * the controller out of reset state.

	 */

	if (spdk_likely(nvme_qpair_state_equals(qpair, NVME_QPAIR_ENABLED)) ||

	if (spdk_likely(nvme_qpair_get_state(qpair) == NVME_QPAIR_ENABLED) ||

	    (req->cmd.opc == SPDK_NVME_OPC_FABRIC &&

	     nvme_qpair_state_equals(qpair, NVME_QPAIR_CONNECTING))) {

	     nvme_qpair_get_state(qpair) == NVME_QPAIR_CONNECTING)) {

		rc = nvme_transport_qpair_submit_request(qpair, req);

	} else {

		/* The controller is being reset - queue this request and

lib/nvme/nvme_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1900,7 +1900,7 @@ nvme_rdma_qpair_process_completions(struct spdk_nvme_qpair *qpair, 
	}

	nvme_rdma_qpair_process_cm_event(rqpair);



	if (spdk_unlikely(nvme_qpair_state_equals(qpair, NVME_QPAIR_DISABLED))) {

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

		goto fail;

	}

test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static void test_nvme_qpair_process_completions(void) 
	CU_ASSERT(STAILQ_EMPTY(&qpair.queued_req));

	CU_ASSERT(g_num_cb_passed == 0);

	CU_ASSERT(g_num_cb_failed == 0);

	CU_ASSERT(nvme_qpair_state_equals(&qpair, NVME_QPAIR_ENABLED));

	CU_ASSERT(nvme_qpair_get_state(&qpair) == NVME_QPAIR_ENABLED);



	g_called_transport_process_completions = false;

	g_transport_process_completions_rc = -ENXIO;