ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: replace nvme_qpair_state_equals.

Browse Source 
nvme_qpair_get_state fits more closely with the semantics in other
modules.

Change-Id: I6ea8e02abe27253d9b4d779a43ac1963be56356a
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476920
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Alexey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Seth Howell 2019-12-05 08:42:29 -07:00 committed by Tomasz Zawadzki
parent 24bca2eadd
commit 61537a190e
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvme/nvme_ctrlr.c
View File

@ -408,7 +408,7 @@ spdk_nvme_ctrlr_reconnect_io_qpair(struct spdk_nvme_qpair *qpair)
goto out; goto out;
} }
if (!nvme_qpair_state_equals(qpair, NVME_QPAIR_DISABLED)) { if (nvme_qpair_get_state(qpair) != NVME_QPAIR_DISABLED) {
rc = 0; rc = 0;
goto out; goto out;
} }

7
lib/nvme/nvme_internal.h
View File

@ -994,10 +994,9 @@ nvme_qpair_set_state(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state)
qpair->state = state; qpair->state = state;
} }
static inline bool static inline enum nvme_qpair_state
nvme_qpair_state_equals(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state) nvme_qpair_get_state(struct spdk_nvme_qpair *qpair) {
{ return qpair->state;
return qpair->state == state;
} }
static inline void static inline void

10
lib/nvme/nvme_qpair.c
View File

@ -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 * 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. * 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_set_state(qpair, NVME_QPAIR_ENABLING);
nvme_qpair_complete_error_reqs(qpair); nvme_qpair_complete_error_reqs(qpair);
nvme_transport_qpair_abort_reqs(qpair, 0 /* retry */); 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 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) && 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 * qpair is not enabled, likely because a controller reset is
* in progress. * 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 * 2. Always allow fabrics commands through - these get
* the controller out of reset state. * 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 && (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); rc = nvme_transport_qpair_submit_request(qpair, req);
} else { } else {
/* The controller is being reset - queue this request and /* The controller is being reset - queue this request and

2
lib/nvme/nvme_rdma.c
View File

@ -1900,7 +1900,7 @@ nvme_rdma_qpair_process_completions(struct spdk_nvme_qpair *qpair,
} }
nvme_rdma_qpair_process_cm_event(rqpair); 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; goto fail;
} }

2
test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
View File

@ -269,7 +269,7 @@ static void test_nvme_qpair_process_completions(void)
CU_ASSERT(STAILQ_EMPTY(&qpair.queued_req)); CU_ASSERT(STAILQ_EMPTY(&qpair.queued_req));
CU_ASSERT(g_num_cb_passed == 0); CU_ASSERT(g_num_cb_passed == 0);
CU_ASSERT(g_num_cb_failed == 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_called_transport_process_completions = false;
g_transport_process_completions_rc = -ENXIO; g_transport_process_completions_rc = -ENXIO;