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

nvmf: Simplify connection poller.

Browse Source 
Remove an extra layer of function calls.

Change-Id: I0699258439a731b85f8d145db9189e89b8590626
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-24 10:08:16 -07:00
parent 806eb493ca
commit 631f5f27ac
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/nvmf/conn.c
View File

@ -940,7 +940,7 @@ recv_error:
return -1; return -1;
} }
static int nvmf_cq_event_handler(struct spdk_nvmf_conn *conn) static int nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
{ {
struct ibv_wc wc; struct ibv_wc wc;
struct nvme_qp_tx_desc *tx_desc; struct nvme_qp_tx_desc *tx_desc;
@ -1051,54 +1051,25 @@ handler_error:
return -1; return -1;
} }
static int nvmf_execute_conn(struct spdk_nvmf_conn *conn)
{
int rc = 0;
/* for an active session, process any pending NVMf completions */
if (conn->sess) {
if (conn->type == CONN_TYPE_AQ)
nvmf_check_admin_completions(conn->sess);
else
nvmf_check_io_completions(conn->sess);
}
/* process all pending completions */
rc = nvmf_cq_event_handler(conn);
if (rc > 0) {
SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ event handler, %d CQ completions\n", rc);
} else if (rc < 0) {
SPDK_ERRLOG("CQ event handler error!\n");
return -1;
}
return 0;
}
/**
\brief This is the main routine for the nvmf connection work item.
Serves mainly as a wrapper for the nvmf_execute_conn() function which
does the bulk of the work. This function handles connection cleanup when
NVMf application is exiting or there is an error on the connection.
It also drains the connection if the work item is being suspended to
move to a different reactor.
*/
static void static void
spdk_nvmf_conn_do_work(void *arg) spdk_nvmf_conn_do_work(void *arg)
{ {
struct spdk_nvmf_conn *conn = arg; struct spdk_nvmf_conn *conn = arg;
int rc;
rc = nvmf_execute_conn(conn); /* process pending NVMe device completions */
if (conn->sess) {
if (conn->type == CONN_TYPE_AQ) {
nvmf_check_admin_completions(conn->sess);
} else {
nvmf_check_io_completions(conn->sess);
}
}
if (rc != 0 || conn->state == CONN_STATE_EXITING || /* process pending RDMA completions */
nvmf_check_rdma_completions(conn);
if (conn->state == CONN_STATE_EXITING ||
conn->state == CONN_STATE_FABRIC_DISCONNECT) { conn->state == CONN_STATE_FABRIC_DISCONNECT) {
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "state exiting to shutdown\n");
spdk_nvmf_conn_destruct(conn); spdk_nvmf_conn_destruct(conn);
} }
} }