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

nvme_rdma: Add rdma_cm_event_str

Browse Source 
To make the error message more clear.

Change-Id: I95a9a3e06f4473da30d022134a8da764f165a070
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/388880
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ziye Yang 2017-11-24 15:17:22 +08:00 committed by Jim Harris
parent 1594b13993
commit b8a5cb99af
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/nvme/nvme_rdma.c
View File

@ -119,6 +119,25 @@ struct spdk_nvme_rdma_req {
STAILQ_ENTRY(spdk_nvme_rdma_req) link; STAILQ_ENTRY(spdk_nvme_rdma_req) link;
}; };
static const char *rdma_cm_event_str[] = {
"RDMA_CM_EVENT_ADDR_RESOLVED",
"RDMA_CM_EVENT_ADDR_ERROR",
"RDMA_CM_EVENT_ROUTE_RESOLVED",
"RDMA_CM_EVENT_ROUTE_ERROR",
"RDMA_CM_EVENT_CONNECT_REQUEST",
"RDMA_CM_EVENT_CONNECT_RESPONSE",
"RDMA_CM_EVENT_CONNECT_ERROR",
"RDMA_CM_EVENT_UNREACHABLE",
"RDMA_CM_EVENT_REJECTED",
"RDMA_CM_EVENT_ESTABLISHED",
"RDMA_CM_EVENT_DISCONNECTED",
"RDMA_CM_EVENT_DEVICE_REMOVAL",
"RDMA_CM_EVENT_MULTICAST_JOIN",
"RDMA_CM_EVENT_MULTICAST_ERROR",
"RDMA_CM_EVENT_ADDR_CHANGE",
"RDMA_CM_EVENT_TIMEWAIT_EXIT"
};
static int nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair); static int nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair);
static inline struct nvme_rdma_qpair * static inline struct nvme_rdma_qpair *
@ -162,6 +181,16 @@ nvme_rdma_req_complete(struct nvme_request *req,
nvme_free_request(req); nvme_free_request(req);
} }
static const char *
nvme_rdma_cm_event_str_get(uint32_t event)
{
if (event < SPDK_COUNTOF(rdma_cm_event_str)) {
return rdma_cm_event_str[event];
} else {
return "Undefined";
}
}
static struct rdma_cm_event * static struct rdma_cm_event *
nvme_rdma_get_event(struct rdma_event_channel *channel, nvme_rdma_get_event(struct rdma_event_channel *channel,
enum rdma_cm_event_type evt) enum rdma_cm_event_type evt)
@ -179,8 +208,9 @@ nvme_rdma_get_event(struct rdma_event_channel *channel,
} }
if (event->event != evt) { if (event->event != evt) {
SPDK_ERRLOG("Received event %d from CM event channel, but expected event %d\n", SPDK_ERRLOG("Received event: %d(%s) from CM event channel, but expected event: (%s)\n",
event->event, evt); event->event, nvme_rdma_cm_event_str_get(event->event),
nvme_rdma_cm_event_str_get(evt));
rdma_ack_cm_event(event); rdma_ack_cm_event(event);
return NULL; return NULL;
} }