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

nvmf: Make RDMA private data required.

Browse Source 
This is not actually optional - it contains required
information for setting up the connection.

Change-Id: I21136de12794a0f4f5c14c5d3e2e3f2306c5c102
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2017-01-13 15:49:36 -07:00 committed by Daniel Verkamp
parent 4ef419305e
commit 765173a7ca
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/nvmf/rdma.c
View File

@ -643,6 +643,15 @@ nvmf_rdma_connect(struct rdma_cm_event *event)
SPDK_ERRLOG("connect request: missing cm_id ibv_context\n"); SPDK_ERRLOG("connect request: missing cm_id ibv_context\n");
goto err0; goto err0;
} }
rdma_param = &event->param.conn;
if (rdma_param->private_data == NULL ||
rdma_param->private_data_len < sizeof(struct spdk_nvmf_rdma_request_private_data)) {
SPDK_ERRLOG("connect request: no private data provided\n");
goto err0;
}
private_data = rdma_param->private_data;
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Recv on fabric intf name %s, dev_name %s\n", SPDK_TRACELOG(SPDK_TRACE_RDMA, "Connect Recv on fabric intf name %s, dev_name %s\n",
event->id->verbs->device->name, event->id->verbs->device->dev_name); event->id->verbs->device->name, event->id->verbs->device->dev_name);
@ -669,7 +678,6 @@ nvmf_rdma_connect(struct rdma_cm_event *event)
max_rw_depth = nvmf_min(max_rw_depth, addr->attr.max_qp_rd_atom); max_rw_depth = nvmf_min(max_rw_depth, addr->attr.max_qp_rd_atom);
/* Next check the remote NIC's hardware limitations */ /* Next check the remote NIC's hardware limitations */
rdma_param = &event->param.conn;
SPDK_TRACELOG(SPDK_TRACE_RDMA, SPDK_TRACELOG(SPDK_TRACE_RDMA,
"Host (Initiator) NIC Max Incoming RDMA R/W operations: %d Max Outgoing RDMA R/W operations: %d\n", "Host (Initiator) NIC Max Incoming RDMA R/W operations: %d Max Outgoing RDMA R/W operations: %d\n",
rdma_param->initiator_depth, rdma_param->responder_resources); rdma_param->initiator_depth, rdma_param->responder_resources);
@ -681,7 +689,6 @@ nvmf_rdma_connect(struct rdma_cm_event *event)
* optional. */ * optional. */
if (rdma_param->private_data != NULL && if (rdma_param->private_data != NULL &&
rdma_param->private_data_len >= sizeof(struct spdk_nvmf_rdma_request_private_data)) { rdma_param->private_data_len >= sizeof(struct spdk_nvmf_rdma_request_private_data)) {
private_data = rdma_param->private_data;
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Host Receive Queue Size: %d\n", private_data->hrqsize); SPDK_TRACELOG(SPDK_TRACE_RDMA, "Host Receive Queue Size: %d\n", private_data->hrqsize);
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Host Send Queue Size: %d\n", private_data->hsqsize); SPDK_TRACELOG(SPDK_TRACE_RDMA, "Host Send Queue Size: %d\n", private_data->hsqsize);
max_queue_depth = nvmf_min(max_queue_depth, private_data->hrqsize); max_queue_depth = nvmf_min(max_queue_depth, private_data->hrqsize);