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

nvme/rdma: Add a utility for getting the next cm event

Browse Source 
Change-Id: Ia7650e729ab233be6464fb0a190c9cd29f462fcf
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-12-15 14:09:03 -07:00
parent fa97f35f06
commit 42dc2836bc
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/nvme/nvme_rdma.c
View File

@ -171,6 +171,31 @@ nvme_rdma_req_complete(struct nvme_request *req,
nvme_free_request(req); nvme_free_request(req);
} }
static int
nvme_rdma_get_event(struct rdma_event_channel *channel,
enum rdma_cm_event_type evt)
{
struct rdma_cm_event *event;
int rc;
rc = rdma_get_cm_event(channel, &event);
if (rc < 0) {
SPDK_ERRLOG("Failed to get event from CM event channel. Error %d (%s)\n",
errno, strerror(errno));
return -1;
}
if (event->event != evt) {
SPDK_ERRLOG("Received event %d from CM event channel, but expected event %d\n",
event->event, evt);
return -1;
}
rdma_ack_cm_event(event);
return 0;
}
static int static int
nvme_rdma_qpair_init(struct nvme_rdma_qpair *rqpair) nvme_rdma_qpair_init(struct nvme_rdma_qpair *rqpair)
{ {
@ -509,7 +534,6 @@ nvme_rdma_bind_addr(struct nvme_rdma_qpair *rqpair,
struct rdma_event_channel *cm_channel) struct rdma_event_channel *cm_channel)
{ {
int ret; int ret;
struct rdma_cm_event *event;
ret = rdma_resolve_addr(rqpair->cm_id, NULL, (struct sockaddr *) sin, ret = rdma_resolve_addr(rqpair->cm_id, NULL, (struct sockaddr *) sin,
NVME_RDMA_TIME_OUT_IN_MS); NVME_RDMA_TIME_OUT_IN_MS);
@ -518,34 +542,22 @@ nvme_rdma_bind_addr(struct nvme_rdma_qpair *rqpair,
return ret; return ret;
} }
ret = rdma_get_cm_event(cm_channel, &event); if (nvme_rdma_get_event(cm_channel, RDMA_CM_EVENT_ADDR_RESOLVED) < 0) {
if (ret) { SPDK_ERRLOG("RDMA address resolution error\n");
SPDK_ERRLOG("rdma address resolution error\n");
return ret;
}
if (event->event != RDMA_CM_EVENT_ADDR_RESOLVED) {
return -1; return -1;
} }
rdma_ack_cm_event(event);
ret = rdma_resolve_route(rqpair->cm_id, NVME_RDMA_TIME_OUT_IN_MS); ret = rdma_resolve_route(rqpair->cm_id, NVME_RDMA_TIME_OUT_IN_MS);
if (ret) { if (ret) {
SPDK_ERRLOG("rdma_resolve_route\n"); SPDK_ERRLOG("rdma_resolve_route\n");
return ret; return ret;
} }
ret = rdma_get_cm_event(cm_channel, &event);
if (ret) { if (nvme_rdma_get_event(cm_channel, RDMA_CM_EVENT_ROUTE_RESOLVED) < 0) {
SPDK_ERRLOG("rdma address resolution error\n"); SPDK_ERRLOG("RDMA route resolution error\n");
return ret;
}
if (event->event != RDMA_CM_EVENT_ROUTE_RESOLVED) {
SPDK_ERRLOG("rdma route resolution error\n");
return -1; return -1;
} }
rdma_ack_cm_event(event);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "rdma_resolve_addr - rdma_resolve_route successful\n");
return 0; return 0;
} }
@ -554,7 +566,6 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair)
{ {
struct rdma_conn_param conn_param; struct rdma_conn_param conn_param;
struct spdk_nvmf_rdma_request_private_data pdata; struct spdk_nvmf_rdma_request_private_data pdata;
struct rdma_cm_event *event;
struct ibv_device_attr attr; struct ibv_device_attr attr;
int ret; int ret;
@ -582,21 +593,11 @@ nvme_rdma_connect(struct nvme_rdma_qpair *rqpair)
return ret; return ret;
} }
ret = rdma_get_cm_event(rqpair->cm_channel, &event); if (nvme_rdma_get_event(rqpair->cm_channel, RDMA_CM_EVENT_ESTABLISHED) < 0) {
if (ret) { SPDK_ERRLOG("RDMA connect error\n");
SPDK_ERRLOG("rdma address resolution error\n");
return ret;
}
if (event->event != RDMA_CM_EVENT_ESTABLISHED) {
SPDK_ERRLOG("rdma connect error\n");
return -1; return -1;
} }
rdma_ack_cm_event(event);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "connect successful\n");
return 0; return 0;
} }