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

nvmf: Eliminate spdk_nvmf_rdma_update_ibv_qp

Browse Source 
The update call was never used independently of the get
call, so combine them

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

61
lib/nvmf/rdma.c
View File

@ -343,35 +343,36 @@ static const char *str_ibv_qp_state[] = {
static enum ibv_qp_state static enum ibv_qp_state
spdk_nvmf_rdma_get_ibv_state(struct spdk_nvmf_rdma_qpair *rqpair) { spdk_nvmf_rdma_get_ibv_state(struct spdk_nvmf_rdma_qpair *rqpair) {
return rqpair->ibv_attr.qp_state;
}
static int
spdk_nvmf_rdma_update_ibv_qp(struct spdk_nvmf_rdma_qpair *rqpair)
{
int rc; int rc;
/* All the attributes needed for recovery */ /* All the attributes needed for recovery */
static int spdk_nvmf_ibv_attr_mask = static int spdk_nvmf_ibv_attr_mask =
IBV_QP_STATE | IBV_QP_STATE |
IBV_QP_PKEY_INDEX | IBV_QP_PKEY_INDEX |
IBV_QP_PORT | IBV_QP_PORT |
IBV_QP_ACCESS_FLAGS | IBV_QP_ACCESS_FLAGS |
IBV_QP_AV | IBV_QP_AV |
IBV_QP_PATH_MTU | IBV_QP_PATH_MTU |
IBV_QP_DEST_QPN | IBV_QP_DEST_QPN |
IBV_QP_RQ_PSN | IBV_QP_RQ_PSN |
IBV_QP_MAX_DEST_RD_ATOMIC | IBV_QP_MAX_DEST_RD_ATOMIC |
IBV_QP_MIN_RNR_TIMER | IBV_QP_MIN_RNR_TIMER |
IBV_QP_SQ_PSN | IBV_QP_SQ_PSN |
IBV_QP_TIMEOUT | IBV_QP_TIMEOUT |
IBV_QP_RETRY_CNT | IBV_QP_RETRY_CNT |
IBV_QP_RNR_RETRY | IBV_QP_RNR_RETRY |
IBV_QP_MAX_QP_RD_ATOMIC; IBV_QP_MAX_QP_RD_ATOMIC;
rc = ibv_query_qp(rqpair->cm_id->qp, &rqpair->ibv_attr, rc = ibv_query_qp(rqpair->cm_id->qp, &rqpair->ibv_attr,
spdk_nvmf_ibv_attr_mask, &rqpair->ibv_init_attr); spdk_nvmf_ibv_attr_mask, &rqpair->ibv_init_attr);
assert(!rc);
return rc; if (rc)
{
SPDK_ERRLOG("Failed to get updated RDMA queue pair state!\n");
assert(false);
}
return rqpair->ibv_attr.qp_state;
} }
static int static int
@ -430,12 +431,7 @@ spdk_nvmf_rdma_set_ibv_state(struct spdk_nvmf_rdma_qpair *rqpair,
rqpair->qpair.qid, str_ibv_qp_state[new_state], errno, strerror(errno)); rqpair->qpair.qid, str_ibv_qp_state[new_state], errno, strerror(errno));
return rc; return rc;
} }
rc = spdk_nvmf_rdma_update_ibv_qp(rqpair);
if (rc) {
SPDK_ERRLOG("QP#%d: failed to update attributes\n", rqpair->qpair.qid);
return rc;
}
state = spdk_nvmf_rdma_get_ibv_state(rqpair); state = spdk_nvmf_rdma_get_ibv_state(rqpair);
if (state != new_state) { if (state != new_state) {
@ -678,7 +674,8 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair)
TAILQ_INSERT_TAIL(&rqpair->state_queue[rdma_req->state], rdma_req, state_link); TAILQ_INSERT_TAIL(&rqpair->state_queue[rdma_req->state], rdma_req, state_link);
rqpair->state_cntr[rdma_req->state]++; rqpair->state_cntr[rdma_req->state]++;
} }
spdk_nvmf_rdma_update_ibv_qp(rqpair);
spdk_nvmf_rdma_get_ibv_state(rqpair);
return 0; return 0;
} }
@ -1947,7 +1944,6 @@ spdk_nvmf_rdma_recover(struct spdk_nvmf_rdma_qpair *rqpair)
recovered = 0; recovered = 0;
while (!recovered) { while (!recovered) {
state = spdk_nvmf_rdma_get_ibv_state(rqpair);
switch (state) { switch (state) {
case IBV_QPS_ERR: case IBV_QPS_ERR:
next_state = IBV_QPS_RESET; next_state = IBV_QPS_RESET;
@ -1977,6 +1973,8 @@ spdk_nvmf_rdma_recover(struct spdk_nvmf_rdma_qpair *rqpair)
if (spdk_nvmf_rdma_set_ibv_state(rqpair, next_state)) { if (spdk_nvmf_rdma_set_ibv_state(rqpair, next_state)) {
goto error; goto error;
} }
state = next_state;
} }
rqpair->qpair.state = SPDK_NVMF_QPAIR_ACTIVE; rqpair->qpair.state = SPDK_NVMF_QPAIR_ACTIVE;
spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qpair_process_pending, rqpair); spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qpair_process_pending, rqpair);
@ -2119,17 +2117,14 @@ spdk_nvmf_process_ib_event(struct spdk_nvmf_rdma_device *device)
switch (event.event_type) { switch (event.event_type) {
case IBV_EVENT_QP_FATAL: case IBV_EVENT_QP_FATAL:
rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp); rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp);
spdk_nvmf_rdma_update_ibv_qp(rqpair);
spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qp_error, rqpair); spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qp_error, rqpair);
break; break;
case IBV_EVENT_SQ_DRAINED: case IBV_EVENT_SQ_DRAINED:
rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp); rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp);
spdk_nvmf_rdma_update_ibv_qp(rqpair);
spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_sq_drained, rqpair); spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_sq_drained, rqpair);
break; break;
case IBV_EVENT_QP_LAST_WQE_REACHED: case IBV_EVENT_QP_LAST_WQE_REACHED:
rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp); rqpair = spdk_nvmf_rqpair_from_qp(event.element.qp);
spdk_nvmf_rdma_update_ibv_qp(rqpair);
spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qp_last_wqe, rqpair); spdk_thread_send_msg(rqpair->qpair.group->thread, _spdk_nvmf_rdma_qp_last_wqe, rqpair);
break; break;
case IBV_EVENT_CQ_ERR: case IBV_EVENT_CQ_ERR: