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

nvmf/rdma: Rename spdk_nvmf_rdma_qp_drained to

Browse Source 
spdk_nvmf_rdma_qpair_recover

Also clean up some print statements

Change-Id: I67cfc9ea560298a310b1216d4542a981c0f1e8f3
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/420938
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
This commit is contained in:
Ben Walker 2018-07-31 16:03:47 -07:00 committed by Jim Harris
parent 531fd76d10
commit b46fb4749b
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/nvmf/rdma.c
View File

@ -1927,34 +1927,29 @@ spdk_nvmf_rdma_drain_state_queue(struct spdk_nvmf_rdma_qpair *rqpair,
} }
static void static void
spdk_nvmf_rdma_qp_drained(struct spdk_nvmf_rdma_qpair *rqpair) spdk_nvmf_rdma_qpair_recover(struct spdk_nvmf_rdma_qpair *rqpair)
{ {
int recovered;
enum ibv_qp_state state, next_state; enum ibv_qp_state state, next_state;
int recovered;
struct spdk_nvmf_rdma_transport *rtransport; struct spdk_nvmf_rdma_transport *rtransport;
SPDK_NOTICELOG("IBV QP#%u drained\n", rqpair->qpair.qid);
if (!spdk_nvmf_rdma_qpair_is_idle(&rqpair->qpair)) { if (!spdk_nvmf_rdma_qpair_is_idle(&rqpair->qpair)) {
/* There must be outstanding requests down to media. /* There must be outstanding requests down to media.
* If so, wait till they're complete. * If so, wait till they're complete.
*/ */
assert(!TAILQ_EMPTY(&rqpair->qpair.outstanding)); assert(!TAILQ_EMPTY(&rqpair->qpair.outstanding));
SPDK_DEBUGLOG(SPDK_LOG_RDMA,
"QP#%u (%p): wait for outstanding requests...\n",
rqpair->qpair.qid, &rqpair->qpair);
return; return;
} }
state = spdk_nvmf_rdma_update_ibv_state(rqpair); state = spdk_nvmf_rdma_update_ibv_state(rqpair);
next_state = state; next_state = state;
SPDK_NOTICELOG("IBV QP#%u is in state: %s\n", SPDK_NOTICELOG("RDMA qpair %u is in state: %s\n",
rqpair->qpair.qid, rqpair->qpair.qid,
str_ibv_qp_state[state]); str_ibv_qp_state[state]);
if (!(state == IBV_QPS_ERR || state == IBV_QPS_RESET)) { if (!(state == IBV_QPS_ERR || state == IBV_QPS_RESET)) {
SPDK_ERRLOG("Can't recover IBV qp#%u from the state: %s\n", SPDK_ERRLOG("Can't recover RDMA qpair %u from the state: %s\n",
rqpair->qpair.qid, rqpair->qpair.qid,
str_ibv_qp_state[state]); str_ibv_qp_state[state]);
spdk_nvmf_qpair_disconnect(&rqpair->qpair, NULL, NULL); spdk_nvmf_qpair_disconnect(&rqpair->qpair, NULL, NULL);
@ -1962,7 +1957,6 @@ spdk_nvmf_rdma_qp_drained(struct spdk_nvmf_rdma_qpair *rqpair)
} }
recovered = 0; recovered = 0;
while (!recovered) { while (!recovered) {
switch (state) { switch (state) {
case IBV_QPS_ERR: case IBV_QPS_ERR:
@ -1981,7 +1975,7 @@ spdk_nvmf_rdma_qp_drained(struct spdk_nvmf_rdma_qpair *rqpair)
recovered = 1; recovered = 1;
break; break;
default: default:
SPDK_ERRLOG("IBV qp#%u unexpected state for recovery: %u\n", SPDK_ERRLOG("RDMA qpair %u unexpected state for recovery: %u\n",
rqpair->qpair.qid, state); rqpair->qpair.qid, state);
goto error; goto error;
} }
@ -1998,12 +1992,15 @@ spdk_nvmf_rdma_qp_drained(struct spdk_nvmf_rdma_qpair *rqpair)
} }
rtransport = SPDK_CONTAINEROF(rqpair->qpair.transport, rtransport = SPDK_CONTAINEROF(rqpair->qpair.transport,
struct spdk_nvmf_rdma_transport, transport); struct spdk_nvmf_rdma_transport,
transport);
spdk_nvmf_rdma_qpair_process_pending(rtransport, rqpair); spdk_nvmf_rdma_qpair_process_pending(rtransport, rqpair);
return; return;
error: error:
SPDK_ERRLOG("IBV qp#%u recovery failed\n", rqpair->qpair.qid); SPDK_NOTICELOG("RDMA qpair %u: recovery failed, disconnecting...\n",
rqpair->qpair.qid);
spdk_nvmf_qpair_disconnect(&rqpair->qpair, NULL, NULL); spdk_nvmf_qpair_disconnect(&rqpair->qpair, NULL, NULL);
} }
@ -2032,7 +2029,7 @@ _spdk_nvmf_rdma_qp_error(void *arg)
spdk_nvmf_rdma_drain_state_queue(rqpair, RDMA_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST); spdk_nvmf_rdma_drain_state_queue(rqpair, RDMA_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST);
spdk_nvmf_rdma_drain_state_queue(rqpair, RDMA_REQUEST_STATE_COMPLETING); spdk_nvmf_rdma_drain_state_queue(rqpair, RDMA_REQUEST_STATE_COMPLETING);
spdk_nvmf_rdma_qp_drained(rqpair); spdk_nvmf_rdma_qpair_recover(rqpair);
} }
static void static void
@ -2373,11 +2370,8 @@ spdk_nvmf_rdma_request_complete(struct spdk_nvmf_request *req)
if (rqpair->qpair.state == SPDK_NVMF_QPAIR_ACTIVE && rqpair->ibv_attr.qp_state == IBV_QPS_ERR) { if (rqpair->qpair.state == SPDK_NVMF_QPAIR_ACTIVE && rqpair->ibv_attr.qp_state == IBV_QPS_ERR) {
/* If the NVMe-oF layer thinks the connection is active, but the RDMA layer thinks /* If the NVMe-oF layer thinks the connection is active, but the RDMA layer thinks
* the connection is dead, check if this is the final I/O to complete and perform * the connection is dead, perform error recovery. */
* error recovery. */ spdk_nvmf_rdma_qpair_recover(rqpair);
if (spdk_nvmf_rdma_qpair_is_idle(&rqpair->qpair)) {
spdk_nvmf_rdma_qp_drained(rqpair);
}
} }
return 0; return 0;